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

3 files changed, 18 insertions, 36 deletions

diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
index 976c6bb2a0..a58d815db2 100644
--- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt
+++ b/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()
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index 2675070329..194cbc79a9 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/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)
diff --git a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt b/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
index d39b81cc7f..45cf01fb1e 100644
--- a/src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt
+++ b/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"