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

1 files changed, 60 insertions, 23 deletions

diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index dc489b721a..74da7af125 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/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:
-# F16C_SOURCES = "global/qfloat16_f16c.c"
+if(NOT _ss_f16c_cxx)
+    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