Regenerate qtbase after wip/qt6 -> wip/cmake merge

Note that android builds will be broken after this merge and
regeneration, because we don't currently handle the minimum required
changes that were brought in with the Android multi ABI support
that comes from 5.14.

This will have to be addressed in a separate change.
For now the build on Android will fail while compiling due to incorrect
generation of LIB_SUFFIX with QT_ARCH.

Change-Id: Ia4a871f4b7ddd0da11caf5f34e10a599a97bb55d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot

qmake/.prev_CMakeLists.txt

@@ -81,11 +81,16 @@ add_qt_executable(qmake
         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

qmake/CMakeLists.txt

@@ -55,6 +55,10 @@ add_qt_tool(qmake # 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/.prev_CMakeLists.txt

@@ -174,7 +174,15 @@ add_qt_module(Core
         thread/qthread.cpp thread/qthread.h
         thread/qthreadstorage.h
         thread/qwaitcondition.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
@@ -185,7 +193,6 @@ add_qt_module(Core
         tools/qcontainertools_impl.h
         tools/qcontiguouscache.cpp tools/qcontiguouscache.h
         tools/qcryptographichash.cpp tools/qcryptographichash.h
-        tools/qeasingcurve.cpp tools/qeasingcurve.h
         tools/qfreelist.cpp tools/qfreelist_p.h
         tools/qhash.cpp tools/qhash.h
         tools/qhashfunctions.h
@@ -214,7 +221,6 @@ add_qt_module(Core
         tools/qsimd.cpp tools/qsimd_p.h
         tools/qsize.cpp tools/qsize.h
         tools/qstack.h
-        tools/qtimeline.cpp tools/qtimeline.h
         tools/qtools_p.h
         tools/qvarlengtharray.h
         tools/qvector.h
@@ -237,6 +243,8 @@ add_qt_module(Core
     NO_PCH_SOURCES
         "text/qstring_compat.cpp"
 )
+
+
 add_qt_simd_part(Core SIMD mips_dsp
     SOURCES
         ../gui/painting/qt_mips_asm_dsp_p.h
@@ -244,7 +252,6 @@ add_qt_simd_part(Core SIMD mips_dsp
 )
 
 
-
 if(ANDROID)
     set_property(TARGET Core APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
         jar/QtAndroid.jar
@@ -303,12 +310,20 @@ endif()
 #### Keys ignored in scope 3:.:.:corelib.pro:NOT QT_NAMESPACE_ISEMPTY:
 # MODULE_DEFINES = "QT_NAMESPACE=$$QT_NAMESPACE"
 
+extend_target(Core CONDITION ANDROID
+    SOURCES
+        kernel/qsharedmemory_android.cpp
+        kernel/qsystemsemaphore_android.cpp
+    DEFINES
+        LIBS_SUFFIX='\\"_.so\\"'
+)
+
 extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x67000000"
 )
 
-#### Keys ignored in scope 5:.:.:corelib.pro:FREEBSD OR OPENBSD:
+#### Keys ignored in scope 6:.:.:corelib.pro:FREEBSD OR OPENBSD:
 # QMAKE_LFLAGS_NOUNDEF = <EMPTY>
 
 extend_target(Core CONDITION QT_FEATURE_animation
@@ -402,27 +417,27 @@ extend_target(Core CONDITION INTEGRITY
         --pending_instantiations=128
 )
 
-#### Keys ignored in scope 13:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_HOST_DATA_DIR):
+#### Keys ignored in scope 14:.:.: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 14:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_INSTALL_DATA_DIR):
+#### Keys ignored in scope 15:.:.: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 18:.:global:global/global.pri:QT_CPU_FEATURES__ss_QT_ARCH___contains___f16c:
+#### Keys ignored in scope 19:.:global:global/global.pri:QT_CPU_FEATURES__ss_QT_ARCH___contains___f16c:
 # f16c_cxx = "true"
 
-#### Keys ignored in scope 20:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
+#### Keys ignored in scope 21:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
 # f16c_cxx = "false"
 
-#### Keys ignored in scope 22:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
+#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
 # f16c_cxx = "true"
 
-#### Keys ignored in scope 24:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
+#### Keys ignored in scope 25:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
 # f16c_cxx = "true"
 
-#### Keys ignored in scope 25:.:global:global/global.pri:else:
+#### Keys ignored in scope 26:.:global:global/global.pri:else:
 # f16c_cxx = "false"
 
 extend_target(Core CONDITION _ss_f16c_cxx
@@ -430,8 +445,12 @@ extend_target(Core CONDITION _ss_f16c_cxx
         QFLOAT16_INCLUDE_FAST
 )
 
-#### Keys ignored in scope 27:.:global:global/global.pri:else:
+if(NOT _ss_f16c_cxx)
-# F16C_SOURCES = "global/qfloat16_f16c.c"
+    add_qt_simd_part(Core SIMD f16c
+        SOURCES
+            global/qfloat16_f16c.c
+    )
+endif()
 
 extend_target(Core CONDITION NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static AND (hurd_x_ OR linux_x_)
     DEFINES
@@ -445,7 +464,7 @@ extend_target(Core CONDITION LINUX AND NOT static
         global/minimum-linux_p.h
 )
 
-#### Keys ignored in scope 32:.:global:global/global.pri:precompile_header:
+#### Keys ignored in scope 33:.: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}"
@@ -454,7 +473,7 @@ extend_target(Core CONDITION LINUX AND NOT static
 # 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 33:.:global:global/global.pri:silent:
+#### Keys ignored in scope 34:.:global:global/global.pri:silent:
 # no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&"
 
 extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static
@@ -472,7 +491,7 @@ extend_target(Core CONDITION QT_FEATURE_journald
         PkgConfig::Libsystemd
 )
 
-#### Keys ignored in scope 37:.:global:global/global.pri:GCC AND ltcg:
+#### Keys ignored in scope 38:.: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"
@@ -481,7 +500,7 @@ extend_target(Core CONDITION QT_FEATURE_journald
 # versiontagging_compiler.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}"
 # versiontagging_compiler.variable_out = "OBJECTS"
 
-#### Keys ignored in scope 38:.:global:global/global.pri:silent:
+#### Keys ignored in scope 39:.:global:global/global.pri:silent:
 # versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&"
 
 extend_target(Core CONDITION NOT GCC OR NOT ltcg
@@ -510,6 +529,7 @@ extend_target(Core CONDITION QT_FEATURE_thread
         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
@@ -579,6 +599,12 @@ extend_target(Core CONDITION QT_FEATURE_commandlineparser
         tools/qcommandlineparser.cpp tools/qcommandlineparser.h
 )
 
+extend_target(Core CONDITION QT_FEATURE_easingcurve
+    SOURCES
+        tools/qeasingcurve.cpp tools/qeasingcurve.h
+        tools/qtimeline.cpp tools/qtimeline.h
+)
+
 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
@@ -629,6 +655,23 @@ extend_target(Core CONDITION QT_FEATURE_regularexpression
         WrapPCRE2::WrapPCRE2
 )
 
+extend_target(Core CONDITION QT_FEATURE_hijricalendar
+    SOURCES
+        time/qhijricalendar.cpp time/qhijricalendar_p.h
+        time/qhijricalendar_data_p.h
+)
+
+extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar
+    SOURCES
+        time/qislamiccivilcalendar.cpp time/qislamiccivilcalendar_p.h
+)
+
+extend_target(Core CONDITION QT_FEATURE_jalalicalendar
+    SOURCES
+        time/qjalalicalendar.cpp time/qjalalicalendar_p.h
+        time/qjalalicalendar_data_p.h
+)
+
 extend_target(Core CONDITION QT_FEATURE_timezone
     SOURCES
         time/qtimezone.cpp time/qtimezone.h
@@ -896,12 +939,6 @@ extend_target(Core CONDITION UNIX AND NOT ANDROID
         kernel/qsystemsemaphore_unix.cpp
 )
 
-extend_target(Core CONDITION ANDROID
-    SOURCES
-        kernel/qsharedmemory_android.cpp
-        kernel/qsystemsemaphore_android.cpp
-)
-
 extend_target(Core CONDITION VXWORKS
     SOURCES
         kernel/qfunctions_vxworks.cpp kernel/qfunctions_vxworks.h

src/corelib/CMakeLists.txt

@@ -188,7 +188,15 @@ add_qt_module(Core
         thread/qthread.cpp thread/qthread.h
         thread/qthreadstorage.h
         thread/qwaitcondition.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
@@ -199,7 +207,6 @@ add_qt_module(Core
         tools/qcontainertools_impl.h
         tools/qcontiguouscache.cpp tools/qcontiguouscache.h
         tools/qcryptographichash.cpp tools/qcryptographichash.h
-        tools/qeasingcurve.cpp tools/qeasingcurve.h
         tools/qfreelist.cpp tools/qfreelist_p.h
         tools/qhash.cpp tools/qhash.h
         tools/qhashfunctions.h
@@ -228,7 +235,6 @@ add_qt_module(Core
         tools/qsimd.cpp tools/qsimd_p.h
         tools/qsize.cpp tools/qsize.h
         tools/qstack.h
-        tools/qtimeline.cpp tools/qtimeline.h
         tools/qtools_p.h
         tools/qvarlengtharray.h
         tools/qvector.h
@@ -243,7 +249,7 @@ add_qt_module(Core
     PRECOMPILED_HEADER
         global/qt_pch.h
     NO_PCH_SOURCES
-        text/qstring_compat.cpp
+        "text/qstring_compat.cpp"
     LIBRARIES
         ZLIB::ZLIB
         # double-conversion # special case
@@ -330,7 +336,6 @@ add_qt_simd_part(Core SIMD mips_dsp
 )
 
 
-
 if(ANDROID)
     set_property(TARGET Core APPEND PROPERTY QT_ANDROID_BUNDLED_JAR_DEPENDENCIES
         jar/QtAndroid.jar
@@ -389,12 +394,20 @@ endif()
 #### Keys ignored in scope 3:.:.:corelib.pro:NOT QT_NAMESPACE_ISEMPTY:
 # MODULE_DEFINES = "QT_NAMESPACE=$$QT_NAMESPACE"
 
+extend_target(Core CONDITION ANDROID
+    SOURCES
+        kernel/qsharedmemory_android.cpp
+        kernel/qsystemsemaphore_android.cpp
+    DEFINES
+        LIBS_SUFFIX='\\"_.so\\"'
+)
+
 extend_target(Core CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
     LINK_OPTIONS
         "/BASE:0x67000000"
 )
 
-#### Keys ignored in scope 5:.:.:corelib.pro:FREEBSD OR OPENBSD:
+#### Keys ignored in scope 6:.:.:corelib.pro:FREEBSD OR OPENBSD:
 # QMAKE_LFLAGS_NOUNDEF = <EMPTY>
 
 extend_target(Core CONDITION QT_FEATURE_animation
@@ -487,33 +500,30 @@ extend_target(Core CONDITION INTEGRITY
         --pending_instantiations=128
 )
 
-#### Keys ignored in scope 13:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_HOST_DATA_DIR):
+#### Keys ignored in scope 14:.:.: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 14:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_INSTALL_DATA_DIR):
+#### Keys ignored in scope 15:.:.: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 18:.:global:global/global.pri:QT_CPU_FEATURES__ss_QT_ARCH___contains___f16c:
+#### Keys ignored in scope 19:.:global:global/global.pri:QT_CPU_FEATURES__ss_QT_ARCH___contains___f16c:
 # f16c_cxx = "true"
 
-#### Keys ignored in scope 20:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
+#### Keys ignored in scope 21:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
 # f16c_cxx = "false"
 
-#### Keys ignored in scope 22:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
+#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
 # f16c_cxx = "true"
 
-#### Keys ignored in scope 24:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
+#### Keys ignored in scope 25:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
 # f16c_cxx = "true"
 
-#### Keys ignored in scope 25:.:global:global/global.pri:else:
+#### Keys ignored in scope 26:.:global:global/global.pri:else:
 # f16c_cxx = "false"
 
-# extend_target(Core CONDITION _ss_f16c_cxx ... # special case: Handled manually:
+# extend_target(Core CONDITION _ss_f16c_cxx ... # special case remove: Handled manually
-
-#### Keys ignored in scope 27:.:global:global/global.pri:else:
-# F16C_SOURCES = "global/qfloat16_f16c.c"
 
 # special case begin
 # Remove this because it's handled manually
@@ -530,7 +540,7 @@ extend_target(Core CONDITION LINUX AND NOT static
         global/minimum-linux_p.h
 )
 
-#### Keys ignored in scope 32:.:global:global/global.pri:precompile_header:
+#### Keys ignored in scope 33:.: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}"
@@ -539,7 +549,7 @@ extend_target(Core CONDITION LINUX AND NOT static
 # 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 33:.:global:global/global.pri:silent:
+#### Keys ignored in scope 34:.:global:global/global.pri:silent:
 # no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&"
 
 extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static
@@ -557,7 +567,7 @@ extend_target(Core CONDITION QT_FEATURE_journald
         PkgConfig::Libsystemd
 )
 
-#### Keys ignored in scope 37:.:global:global/global.pri:GCC AND ltcg:
+#### Keys ignored in scope 38:.: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"
@@ -566,7 +576,7 @@ extend_target(Core CONDITION QT_FEATURE_journald
 # versiontagging_compiler.output = "${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${firstQMAKE_EXT_OBJ}"
 # versiontagging_compiler.variable_out = "OBJECTS"
 
-#### Keys ignored in scope 38:.:global:global/global.pri:silent:
+#### Keys ignored in scope 39:.:global:global/global.pri:silent:
 # versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&"
 
 extend_target(Core CONDITION NOT GCC OR NOT ltcg
@@ -595,6 +605,7 @@ extend_target(Core CONDITION QT_FEATURE_thread
         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
@@ -664,6 +675,12 @@ extend_target(Core CONDITION QT_FEATURE_commandlineparser
         tools/qcommandlineparser.cpp tools/qcommandlineparser.h
 )
 
+extend_target(Core CONDITION QT_FEATURE_easingcurve
+    SOURCES
+        tools/qeasingcurve.cpp tools/qeasingcurve.h
+        tools/qtimeline.cpp tools/qtimeline.h
+)
+
 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
@@ -714,6 +731,23 @@ extend_target(Core CONDITION QT_FEATURE_regularexpression
         WrapPCRE2::WrapPCRE2
 )
 
+extend_target(Core CONDITION QT_FEATURE_hijricalendar
+    SOURCES
+        time/qhijricalendar.cpp time/qhijricalendar_p.h
+        time/qhijricalendar_data_p.h
+)
+
+extend_target(Core CONDITION QT_FEATURE_islamiccivilcalendar
+    SOURCES
+        time/qislamiccivilcalendar.cpp time/qislamiccivilcalendar_p.h
+)
+
+extend_target(Core CONDITION QT_FEATURE_jalalicalendar
+    SOURCES
+        time/qjalalicalendar.cpp time/qjalalicalendar_p.h
+        time/qjalalicalendar_data_p.h
+)
+
 extend_target(Core CONDITION QT_FEATURE_timezone
     SOURCES
         time/qtimezone.cpp time/qtimezone.h
@@ -981,12 +1015,6 @@ extend_target(Core CONDITION UNIX AND NOT ANDROID
         kernel/qsystemsemaphore_unix.cpp
 )
 
-extend_target(Core CONDITION ANDROID
-    SOURCES
-        kernel/qsharedmemory_android.cpp
-        kernel/qsystemsemaphore_android.cpp
-)
-
 extend_target(Core CONDITION VXWORKS
     SOURCES
         kernel/qfunctions_vxworks.cpp kernel/qfunctions_vxworks.h

src/corelib/configure.cmake

@@ -822,11 +822,16 @@ qt_feature("big_codecs" PUBLIC
     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
+    CONDITION QT_FEATURE_properties AND QT_FEATURE_easingcurve
 )
 qt_feature_definition("animation" "QT_NO_ANIMATION" NEGATE VALUE "1")
 qt_feature("statemachine" PUBLIC
@@ -851,6 +856,22 @@ qt_feature("sha3_fast" PRIVATE
     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"

src/gui/.prev_CMakeLists.txt

@@ -22,7 +22,6 @@ add_qt_module(Gui
         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/qpictureformatplugin.cpp image/qpictureformatplugin.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
@@ -249,61 +248,11 @@ add_qt_resource(Gui "qmake_webgradients"
     PREFIX
         "qgradient"
     BASE
-        "['painting']"
+        "painting"
     FILES
         ${qmake_webgradients_resource_files}
 )
 
-add_qt_simd_part(Gui SIMD sse2
-    SOURCES
-        painting/qdrawhelper_sse2.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD ssse3
-    SOURCES
-        image/qimage_ssse3.cpp
-        painting/qdrawhelper_ssse3.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD sse4_1
-    SOURCES
-        painting/qdrawhelper_sse4.cpp
-        painting/qimagescale_sse4.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD neon
-    SOURCES
-        image/qimage_neon.cpp
-        painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
-        painting/qimagescale_neon.cpp
-)
-
-
-add_qt_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
-)
-
-
-add_qt_simd_part(Gui SIMD mips_dspr2
-    SOURCES
-        image/qimage_mips_dspr2.cpp
-        image/qimage_mips_dspr2_asm.S
-        painting/qdrawhelper_mips_dspr2_asm.S
-)
-
-
-add_qt_simd_part(Gui SIMD arch_haswell
-    SOURCES
-        painting/qdrawhelper_avx2.cpp
-)
-
-
 
 #### Keys ignored in scope 1:.:.:gui.pro:<TRUE>:
 # QMAKE_DYNAMIC_LIST_FILE = "$$PWD/QtGui.dynlist"
@@ -477,6 +426,69 @@ extend_target(Gui CONDITION QT_FEATURE_png
         PNG::PNG
 )
 
+if(NOT ANDROID)
+    add_qt_simd_part(Gui SIMD sse2
+        SOURCES
+            painting/qdrawhelper_sse2.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD ssse3
+        SOURCES
+            image/qimage_ssse3.cpp
+            painting/qdrawhelper_ssse3.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD sse4_1
+        SOURCES
+            painting/qdrawhelper_sse4.cpp
+            painting/qimagescale_sse4.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD neon
+        SOURCES
+            image/qimage_neon.cpp
+            painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+            painting/qimagescale_neon.cpp
+    )
+
+    add_qt_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
+    )
+
+    add_qt_simd_part(Gui SIMD mips_dspr2
+        SOURCES
+            image/qimage_mips_dspr2.cpp
+            image/qimage_mips_dspr2_asm.S
+            painting/qdrawhelper_mips_dspr2_asm.S
+    )
+
+    add_qt_simd_part(Gui SIMD arch_haswell
+        SOURCES
+            painting/qdrawhelper_avx2.cpp
+    )
+endif()
+
+extend_target(Gui CONDITION ANDROID AND arm64-v8a
+    SOURCES
+        image/qimage_neon.cpp
+        painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+        painting/qimagescale_neon.cpp
+)
+
+extend_target(Gui CONDITION ANDROID AND (x86 OR 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
+)
+
 extend_target(Gui CONDITION QT_FEATURE_harfbuzz
     SOURCES
         text/qharfbuzzng.cpp text/qharfbuzzng_p.h
@@ -520,13 +532,27 @@ extend_target(Gui CONDITION QT_FEATURE_cssparser
         text/qcssparser.cpp text/qcssparser_p.h
 )
 
-extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
+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
 )
 
-#### Keys ignored in scope 50:.:painting:painting/painting.pri:NOT APPLE_UIKIT AND NOT WIN32 AND NOT INTEGRITY AND NOT QT_ARCH___contains___arm64:
+if(UNIX AND NOT ANDROID AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64"))
-# NEON_ASM = "../3rdparty/pixman/pixman-arm-neon-asm.S" "painting/qdrawhelper_neon_asm.S"
+    add_qt_simd_part(Gui SIMD neon
+        SOURCES
+            ../3rdparty/pixman/pixman-arm-neon-asm.S
+            painting/qdrawhelper_neon_asm.S
+    )
+endif()
+
+extend_target(Gui CONDITION ANDROID AND x86_64
+    SOURCES
+        painting/qdrawhelper_sse4.cpp
+        painting/qimagescale_sse4.cpp
+    DEFINES
+        QT_COMPILER_SUPPORTS_SSE4_1
+        QT_COMPILER_SUPPORTS_SSE4_2
+)
 
 extend_target(Gui CONDITION QT_FEATURE_regularexpression
     SOURCES
@@ -582,7 +608,7 @@ extend_target(Gui CONDITION QT_FEATURE_vulkan
         Vulkan::Vulkan_nolink
 )
 
-#### Keys ignored in scope 68:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
+#### Keys ignored in scope 78:.: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"
@@ -598,10 +624,10 @@ extend_target(Gui CONDITION QT_FEATURE_vulkan
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 69:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 79:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 70:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 extend_target(Gui CONDITION WASM

src/gui/CMakeLists.txt

@@ -65,7 +65,6 @@ add_qt_module(Gui
         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/qpictureformatplugin.cpp image/qpictureformatplugin.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
@@ -295,53 +294,12 @@ set(qmake_webgradients_resource_files
 add_qt_resource(Gui "qmake_webgradients"
     PREFIX
         "/qgradient/" # special case
+    #BASE # special case remove
+        #"painting" # special case remove
     FILES
         ${qmake_webgradients_resource_files}
 )
 
-add_qt_simd_part(Gui SIMD sse2
-    SOURCES
-        painting/qdrawhelper_sse2.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD ssse3
-    SOURCES
-        image/qimage_ssse3.cpp
-        painting/qdrawhelper_ssse3.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD sse4_1
-    SOURCES
-        painting/qdrawhelper_sse4.cpp
-        painting/qimagescale_sse4.cpp
-)
-
-
-add_qt_simd_part(Gui SIMD neon
-    SOURCES
-        image/qimage_neon.cpp
-        painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
-        painting/qimagescale_neon.cpp
-)
-
-
-add_qt_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
-)
-
-
-add_qt_simd_part(Gui SIMD mips_dspr2
-    SOURCES
-        image/qimage_mips_dspr2.cpp
-        image/qimage_mips_dspr2_asm.S
-        painting/qdrawhelper_mips_dspr2_asm.S
-)
-
 # special case begin
 # Replace arch_haswell with avx2 feature. That is what is used in the code requireing
 # this file, too!
@@ -359,7 +317,6 @@ extend_target(Gui CONDITION QT_FEATURE_standarditemmodel
 # 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"
@@ -551,6 +508,69 @@ extend_target(Gui CONDITION QT_FEATURE_png
         PNG::PNG
 )
 
+if(NOT ANDROID)
+    add_qt_simd_part(Gui SIMD sse2
+        SOURCES
+            painting/qdrawhelper_sse2.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD ssse3
+        SOURCES
+            image/qimage_ssse3.cpp
+            painting/qdrawhelper_ssse3.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD sse4_1
+        SOURCES
+            painting/qdrawhelper_sse4.cpp
+            painting/qimagescale_sse4.cpp
+    )
+
+    add_qt_simd_part(Gui SIMD neon
+        SOURCES
+            image/qimage_neon.cpp
+            painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+            painting/qimagescale_neon.cpp
+    )
+
+    add_qt_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
+    )
+
+    add_qt_simd_part(Gui SIMD mips_dspr2
+        SOURCES
+            image/qimage_mips_dspr2.cpp
+            image/qimage_mips_dspr2_asm.S
+            painting/qdrawhelper_mips_dspr2_asm.S
+    )
+
+    add_qt_simd_part(Gui SIMD arch_haswell
+        SOURCES
+            painting/qdrawhelper_avx2.cpp
+    )
+endif()
+
+extend_target(Gui CONDITION ANDROID AND arm64-v8a
+    SOURCES
+        image/qimage_neon.cpp
+        painting/qdrawhelper_neon.cpp painting/qdrawhelper_neon_p.h
+        painting/qimagescale_neon.cpp
+)
+
+extend_target(Gui CONDITION ANDROID AND (x86 OR 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
@@ -603,11 +623,28 @@ extend_target(Gui CONDITION QT_FEATURE_cssparser
         text/qcssparser.cpp text/qcssparser_p.h
 )
 
-extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64")
+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"))
+    add_qt_simd_part(Gui SIMD neon
+        SOURCES
+            ../3rdparty/pixman/pixman-arm-neon-asm.S
+            painting/qdrawhelper_neon_asm.S
+    )
+endif()
+
+extend_target(Gui CONDITION ANDROID AND x86_64
+    SOURCES
+        painting/qdrawhelper_sse4.cpp
+        painting/qimagescale_sse4.cpp
+    DEFINES
+        QT_COMPILER_SUPPORTS_SSE4_1
+        QT_COMPILER_SUPPORTS_SSE4_2
+)
+
 # special case begin
 extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (TEST_architecture_arch STREQUAL "arm64" AND QT_FEATURE_neon)
     SOURCES
@@ -616,9 +653,6 @@ extend_target(Gui CONDITION UNIX AND NOT APPLE_UIKIT AND NOT INTEGRITY AND NOT (
 )
 # special case end
 
-#### Keys ignored in scope 51:.:painting:painting/painting.pri:NOT APPLE_UIKIT AND NOT WIN32 AND NOT INTEGRITY AND NOT QT_ARCH___contains___arm64:
-# NEON_ASM = "../3rdparty/pixman/pixman-arm-neon-asm.S" "painting/qdrawhelper_neon_asm.S"
-
 extend_target(Gui CONDITION QT_FEATURE_regularexpression
     SOURCES
         util/qshadergenerator.cpp util/qshadergenerator_p.h
@@ -729,10 +763,10 @@ endif()
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 69:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 79:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 70:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 extend_target(Gui CONDITION WASM

src/gui/configure.cmake

@@ -18,10 +18,6 @@ set_property(CACHE INPUT_libmd4c PROPERTY STRINGS undefined no qt system)
 set(INPUT_libpng "undefined" CACHE STRING "")
 set_property(CACHE INPUT_libpng PROPERTY STRINGS undefined no qt system)
 
-# input xcb
-set(INPUT_xcb "undefined" CACHE STRING "")
-set_property(CACHE INPUT_xcb PROPERTY STRINGS undefined no yes qt system)
-
 
 
 #### Libraries
@@ -438,7 +434,8 @@ glFramebufferTexture(GL_TEXTURE_2D, GL_DEPTH_STENCIL_ATTACHMENT, 1, 0);
 # xcb_syslibs
 qt_config_compile_test(xcb_syslibs
     LABEL "XCB (extensions)"
-"
+"// 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>
@@ -451,7 +448,8 @@ qt_config_compile_test(xcb_syslibs
 #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;
@@ -466,10 +464,12 @@ 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;
 }
-"# FIXME: use: xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb
+"# FIXME: use: 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
 )
 
 
@@ -679,7 +679,7 @@ qt_feature("openvg" PUBLIC
 )
 qt_feature("egl" PUBLIC PRIVATE
     LABEL "EGL"
-    CONDITION ( QT_FEATURE_opengl OR QT_FEATURE_openvg ) AND ( QT_FEATURE_angle OR EGL_FOUND )
+    CONDITION ( QT_FEATURE_opengl OR QT_FEATURE_openvg ) AND ( QT_FEATURE_angle OR EGL_FOUND ) AND ( QT_FEATURE_dlopen OR NOT UNIX )
 )
 qt_feature_definition("egl" "QT_NO_EGL" NEGATE VALUE "1")
 qt_feature("egl_x11" PRIVATE
@@ -771,8 +771,7 @@ qt_feature("xcb" PRIVATE
     SECTION "Platform plugins"
     LABEL "XCB"
     AUTODETECT NOT APPLE
-    CONDITION QT_FEATURE_thread AND QT_FEATURE_xkbcommon AND TARGET XCB::XCB
+    CONDITION QT_FEATURE_thread AND TARGET XCB::XCB AND TEST_xcb_syslibs AND QT_FEATURE_xkbcommon_x11
-    ENABLE INPUT_xcb STREQUAL 'system' OR INPUT_xcb STREQUAL 'qt' OR INPUT_xcb STREQUAL 'yes'
 )
 qt_feature("xcb_glx_plugin" PRIVATE
     LABEL "GLX Plugin"
@@ -800,11 +799,6 @@ qt_feature("xrender" PRIVATE
     CONDITION QT_FEATURE_xcb_native_painting
     EMIT_IF QT_FEATURE_xcb AND QT_FEATURE_xcb_native_painting
 )
-qt_feature("xkb" PRIVATE
-    LABEL "XCB XKB"
-    CONDITION ( NOT ON OR XCB_XKB_FOUND ) AND XKB_FOUND
-    EMIT_IF QT_FEATURE_xcb
-)
 qt_feature("xcb_xlib" PRIVATE
     LABEL "XCB Xlib"
     CONDITION QT_FEATURE_xlib AND X11_XCB_FOUND
@@ -814,15 +808,21 @@ qt_feature("xcb_sm" PRIVATE
     CONDITION QT_FEATURE_sessionmanager AND X11_SM_FOUND
     EMIT_IF QT_FEATURE_xcb
 )
-qt_feature("xcb_xinput" PRIVATE
+qt_feature("system_xcb_xinput" PRIVATE
-    LABEL "XCB XInput"
+    LABEL "Using system-provided xcb-xinput"
-    CONDITION NOT ON OR XCB_XINPUT_FOUND
+    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_FOUND
+)
 qt_feature("xlib" PRIVATE
     LABEL "XLib"
     AUTODETECT NOT APPLE OR QT_FEATURE_xcb

src/network/.prev_CMakeLists.txt

@@ -127,6 +127,7 @@ extend_target(Network CONDITION QT_FEATURE_http
         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

src/network/CMakeLists.txt

@@ -127,6 +127,7 @@ extend_target(Network CONDITION QT_FEATURE_http
         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

src/plugins/platforms/xcb/.prev_CMakeLists.txt

@@ -18,6 +18,7 @@ add_qt_module(XcbQpa
         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
@@ -65,10 +66,12 @@ add_qt_module(XcbQpa
         XCB::XCB
         XCB::XFIXES
         XCB::XINERAMA
+        XCB::XINPUT
+        XCB::XKB
         XKB::XKB
 )
 
-#### Keys ignored in scope 3:.:.:xcb_qpa_lib.pro:<TRUE>:
+#### Keys ignored in scope 2:.:.:xcb_qpa_lib.pro:<TRUE>:
 # _LOADED = "qt_build_paths" "qt_module"
 
 ## Scopes:
@@ -106,13 +109,6 @@ extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
         X11::XCB
 )
 
-extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xinput
-    SOURCES
-        qxcbconnection_xi2.cpp
-    PUBLIC_LIBRARIES
-        XCB::XINPUT
-)
-
 extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
     SOURCES
         qxcbsessionmanager.cpp qxcbsessionmanager.h
@@ -120,12 +116,6 @@ extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
         ${X11_SM_LIB} ${X11_ICE_LIB}
 )
 
-extend_target(XcbQpa CONDITION QT_FEATURE_xkb
-    PUBLIC_LIBRARIES
-        XCB::XKB
-        XKB::XKB
-)
-
 extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
@@ -179,16 +169,13 @@ add_qt_plugin(qxcb
         Qt::XcbQpa
 )
 
-#### Keys ignored in scope 24:.:.:xcb-plugin.pro:<TRUE>:
+#### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>:
 # OTHER_FILES = "xcb.json" "README"
 # _LOADED = "qt_plugin"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 26:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 21:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 add_subdirectory(gl_integrations)
-if(OFF)
-    add_subdirectory(xcb-static)
-endif()

src/plugins/platforms/xcb/CMakeLists.txt

@@ -40,6 +40,7 @@ add_qt_module(XcbQpa
         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
@@ -88,10 +89,12 @@ add_qt_module(XcbQpa
         XCB::XCB
         XCB::XFIXES
         XCB::XINERAMA
+        XCB::XINPUT
+        XCB::XKB
         XKB::XKB
 )
 
-#### Keys ignored in scope 3:.:.:xcb_qpa_lib.pro:<TRUE>:
+#### Keys ignored in scope 2:.:.:xcb_qpa_lib.pro:<TRUE>:
 # _LOADED = "qt_build_paths" "qt_module"
 
 ## Scopes:
@@ -130,13 +133,6 @@ extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
         X11::X11 # special case
 )
 
-extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xinput
-    SOURCES
-        qxcbconnection_xi2.cpp
-    PUBLIC_LIBRARIES
-        XCB::XINPUT
-)
-
 extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
     SOURCES
         qxcbsessionmanager.cpp qxcbsessionmanager.h
@@ -144,12 +140,6 @@ extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
         ${X11_SM_LIB} ${X11_ICE_LIB}
 )
 
-extend_target(XcbQpa CONDITION QT_FEATURE_xkb
-    PUBLIC_LIBRARIES
-        XCB::XKB
-        XKB::XKB
-)
-
 extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
     PUBLIC_LIBRARIES
         ${CMAKE_DL_LIBS}
@@ -204,14 +194,14 @@ add_qt_plugin(qxcb
         Qt::XcbQpa
 )
 
-#### Keys ignored in scope 24:.:.:xcb-plugin.pro:<TRUE>:
+#### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>:
 # OTHER_FILES = "xcb.json" "README"
 # _LOADED = "qt_plugin"
 
 ## Scopes:
 #####################################################################
 
-#### Keys ignored in scope 26:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 21:.:.:xcb-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
 # PLUGIN_EXTENDS = "-"
 add_subdirectory(gl_integrations)
 if(OFF)

src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt

@@ -86,5 +86,10 @@ extend_target(qsqlite CONDITION QT_FEATURE_dlopen AND NOT QT_FEATURE_system_sqli
         ${CMAKE_DL_LIBS}
 )
 
-#### Keys ignored in scope 12:.:../../../3rdparty:../../../3rdparty/sqlite.pri:INTEGRITY:
+extend_target(qsqlite 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"

src/tools/bootstrap/.prev_CMakeLists.txt

@@ -75,7 +75,10 @@ add_qt_module(Bootstrap
         ../../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

src/tools/bootstrap/CMakeLists.txt

@@ -73,7 +73,10 @@ extend_target(Bootstrap
         ../../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

src/widgets/.prev_CMakeLists.txt

@@ -29,7 +29,7 @@ add_qt_module(Widgets
         kernel/qtwidgetsglobal.h kernel/qtwidgetsglobal_p.h
         kernel/qwidget.cpp kernel/qwidget.h kernel/qwidget_p.h
         kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
-        kernel/qwidgetbackingstore.cpp kernel/qwidgetbackingstore_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
@@ -294,11 +294,6 @@ extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386"
         "/BASE:0x65000000"
 )
 
-extend_target(Widgets CONDITION APPLE
-    SOURCES
-        util/qscroller_mac.mm
-)
-
 extend_target(Widgets CONDITION APPLE_OSX
     SOURCES
         kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h
@@ -764,7 +759,6 @@ extend_target(Widgets CONDITION QT_FEATURE_graphicsview
         graphicsview/qgraphicsgridlayout.cpp graphicsview/qgraphicsgridlayout.h
         graphicsview/qgraphicsgridlayoutengine.cpp graphicsview/qgraphicsgridlayoutengine_p.h
         graphicsview/qgraphicsitem.cpp graphicsview/qgraphicsitem.h graphicsview/qgraphicsitem_p.h
-        graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.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
@@ -782,6 +776,11 @@ extend_target(Widgets CONDITION QT_FEATURE_graphicsview
         graphicsview/qsimplex_p.cpp graphicsview/qsimplex_p.h
 )
 
+extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview
+    SOURCES
+        graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h
+)
+
 extend_target(Widgets CONDITION QT_FEATURE_completer
     SOURCES
         util/qcompleter.cpp util/qcompleter.h util/qcompleter_p.h

src/widgets/CMakeLists.txt

@@ -29,7 +29,7 @@ add_qt_module(Widgets
         kernel/qtwidgetsglobal.h kernel/qtwidgetsglobal_p.h
         kernel/qwidget.cpp kernel/qwidget.h kernel/qwidget_p.h
         kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
-        kernel/qwidgetbackingstore.cpp kernel/qwidgetbackingstore_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
@@ -296,11 +296,6 @@ extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386"
         "/BASE:0x65000000"
 )
 
-extend_target(Widgets CONDITION APPLE
-    SOURCES
-        util/qscroller_mac.mm
-)
-
 extend_target(Widgets CONDITION APPLE_OSX
     SOURCES
         kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h
@@ -768,7 +763,6 @@ extend_target(Widgets CONDITION QT_FEATURE_graphicsview
         graphicsview/qgraphicsgridlayout.cpp graphicsview/qgraphicsgridlayout.h
         graphicsview/qgraphicsgridlayoutengine.cpp graphicsview/qgraphicsgridlayoutengine_p.h
         graphicsview/qgraphicsitem.cpp graphicsview/qgraphicsitem.h graphicsview/qgraphicsitem_p.h
-        graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.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
@@ -786,6 +780,11 @@ extend_target(Widgets CONDITION QT_FEATURE_graphicsview
         graphicsview/qsimplex_p.cpp graphicsview/qsimplex_p.h
 )
 
+extend_target(Widgets CONDITION QT_FEATURE_easingcurve AND QT_FEATURE_graphicsview
+    SOURCES
+        graphicsview/qgraphicsitemanimation.cpp graphicsview/qgraphicsitemanimation.h
+)
+
 extend_target(Widgets CONDITION QT_FEATURE_completer
     SOURCES
         util/qcompleter.cpp util/qcompleter.h util/qcompleter_p.h

src/widgets/configure.cmake

@@ -342,6 +342,7 @@ 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"
@@ -519,12 +520,6 @@ qt_feature("columnview" PUBLIC
     CONDITION QT_FEATURE_listview
 )
 qt_feature_definition("columnview" "QT_NO_COLUMNVIEW" NEGATE VALUE "1")
-qt_feature("paint_debug" PUBLIC
-    SECTION "Painting"
-    LABEL "Painting Debug Utilities"
-    PURPOSE "Enabled debugging painting with the environment variables QT_FLUSH_UPDATE and QT_FLUSH_PAINT."
-)
-qt_feature_definition("paint_debug" "QT_NO_PAINT_DEBUG" NEGATE VALUE "1")
 qt_feature("completer" PUBLIC
     SECTION "Utilities"
     LABEL "QCompleter"

tests/auto/corelib/time/CMakeLists.txt

@@ -1,5 +1,6 @@
 # Generated from time.pro.
 
+add_subdirectory(qcalendar)
 add_subdirectory(qdate)
 add_subdirectory(qdatetime)
 add_subdirectory(qtime)

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
+)

tests/auto/corelib/tools/qlinkedlist/.prev_CMakeLists.txt

@@ -0,0 +1,15 @@
+# Generated from qlinkedlist.pro.
+
+#####################################################################
+## tst_qlinkedlist Test:
+#####################################################################
+
+add_qt_test(tst_qlinkedlist
+    SOURCES
+        tst_qlinkedlist.cpp
+    DEFINES
+        -QT_NO_LINKED_LIST
+)
+
+## Scopes:
+#####################################################################

tests/auto/corelib/tools/qlinkedlist/CMakeLists.txt

@@ -5,9 +5,11 @@
 #####################################################################
 
 add_qt_test(tst_qlinkedlist
-    GUI
     SOURCES
         tst_qlinkedlist.cpp
     #DEFINES # special case remove
         #-QT_NO_LINKED_LIST # special case remove until fixed
 )
+
+## Scopes:
+#####################################################################

tests/auto/corelib/tools/qlist/CMakeLists.txt

@@ -1 +1,13 @@
-add_qt_test(tst_qlist SOURCES tst_qlist.cpp)
+# Generated from qlist.pro.
+
+#####################################################################
+## tst_qlist Test:
+#####################################################################
+
+add_qt_test(tst_qlist
+    SOURCES
+        tst_qlist.cpp
+)
+
+## Scopes:
+#####################################################################

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:
+#####################################################################

tests/auto/corelib/tools/qset/CMakeLists.txt

@@ -1 +1,15 @@
-add_qt_test(tst_qset SOURCES tst_qset.cpp)
+# 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:
+#####################################################################

tests/auto/corelib/tools/qvarlengtharray/CMakeLists.txt

@@ -1 +1,13 @@
-add_qt_test(tst_qvarlengtharray SOURCES tst_qvarlengtharray.cpp)
+# Generated from qvarlengtharray.pro.
+
+#####################################################################
+## tst_qvarlengtharray Test:
+#####################################################################
+
+add_qt_test(tst_qvarlengtharray
+    SOURCES
+        tst_qvarlengtharray.cpp
+)
+
+## Scopes:
+#####################################################################

tests/auto/widgets/kernel/qformlayout/CMakeLists.txt

@@ -1 +1,16 @@
-add_qt_test("tst_qformlayout" SOURCES tst_qformlayout.cpp LIBRARIES Qt::Widgets Qt::TestPrivate)
+# Generated from qformlayout.pro.
+
+#####################################################################
+## tst_qformlayout Test:
+#####################################################################
+
+add_qt_test(tst_qformlayout
+    SOURCES
+        tst_qformlayout.cpp
+    LIBRARIES
+        Qt::TestPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)

tests/auto/widgets/styles/qstyle/CMakeLists.txt

@@ -1,3 +1,15 @@
-add_qt_test("tst_qstyle" SOURCES tst_qstyle.cpp LIBRARIES Qt::Widgets Qt::TestPrivate)
+# Generated from qstyle.pro.
 
-extend_target("tst_qstyle" CONDITION ANDROID AND NOT ANDROID_EMBEDDED SOURCES testdata.qrc)
+#####################################################################
+## tst_qstyle Test:
+#####################################################################
+
+add_qt_test(tst_qstyle
+    SOURCES
+        tst_qstyle.cpp
+    LIBRARIES
+        Qt::TestPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)