Regenerate src/

Change-Id: Icef5e834a6acc1cc4488bbed7749e81e1f2388b3
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

6 files changed, 44 insertions, 8 deletions

diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index 3a43b4f03c..f32ff1f8f3 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -452,7 +452,7 @@ if(NOT _ss_f16c_cxx)
     )
 endif()
 
-qt_extend_target(Core CONDITION NOT _x_-armcc_x_ AND NOT cross_compile AND NOT static AND (hurd_x_ OR linux_x_)
+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
diff --git a/src/plugins/styles/windowsvista/CMakeLists.txt b/src/plugins/styles/windowsvista/CMakeLists.txt
index 3304150c3e..bbb9210f10 100644
--- a/src/plugins/styles/windowsvista/CMakeLists.txt
+++ b/src/plugins/styles/windowsvista/CMakeLists.txt
@@ -13,11 +13,12 @@ qt_add_plugin(qwindowsvistastyle
         qwindowsvistastyle_p_p.h
         qwindowsxpstyle.cpp qwindowsxpstyle_p.h
         qwindowsxpstyle_p_p.h
+    INCLUDE_DIRECTORIES
+        ../3rdparty/wintab
     LIBRARIES
         Qt::WidgetsPrivate
         gdi32
         user32
-        uxtheme
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
@@ -26,3 +27,13 @@ qt_add_plugin(qwindowsvistastyle
 
 #### Keys ignored in scope 1:.:.:windowsvista.pro:<TRUE>:
 # DISTFILES = "windowsvistastyle.json"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(qwindowsvistastyle CONDITION NOT WINRT
+    LIBRARIES
+        dwmapi
+        shell32
+        uxtheme
+)
diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt
index 778006aff1..40d2e85cef 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -179,7 +179,7 @@ qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX
         ../../corelib/io/qstandardpaths_unix.cpp
 )
 
-qt_extend_target(Bootstrap CONDITION cross_compile
+qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING
     SOURCES
         ../../3rdparty/zlib/src/adler32.c
         ../../3rdparty/zlib/src/compress.c
@@ -200,7 +200,7 @@ qt_extend_target(Bootstrap CONDITION cross_compile
         ../../3rdparty/zlib/src
 )
 
-qt_extend_target(Bootstrap CONDITION NOT cross_compile
+qt_extend_target(Bootstrap CONDITION NOT CMAKE_CROSSCOMPILING
     LIBRARIES
         ZLIB::ZLIB
 )
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 1da097011d..26013c2a3f 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -184,6 +184,31 @@ qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX
         ../../corelib/io/qstandardpaths_unix.cpp
 )
 
+qt_extend_target(Bootstrap CONDITION CMAKE_CROSSCOMPILING
+    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 NOT CMAKE_CROSSCOMPILING
+    LIBRARIES
+        ZLIB::ZLIB
+)
 # special case: This will never get cross_compiled!
 # extend_target(Bootstrap CONDITION cross_compile [...])
 # extend_target(Bootstrap CONDITION NOT cross_compile [...])
diff --git a/src/tools/rcc/.prev_CMakeLists.txt b/src/tools/rcc/.prev_CMakeLists.txt
index f7b790ee5a..307f08bfa7 100644
--- a/src/tools/rcc/.prev_CMakeLists.txt
+++ b/src/tools/rcc/.prev_CMakeLists.txt
@@ -24,14 +24,14 @@ qt_add_tool(rcc
 ## Scopes:
 #####################################################################
 
-qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile
+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 cross_compile OR NOT QT_FEATURE_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
index 64610dd991..e7f45314c3 100644
--- a/src/tools/rcc/CMakeLists.txt
+++ b/src/tools/rcc/CMakeLists.txt
@@ -25,14 +25,14 @@ qt_add_tool(rcc
 ## Scopes:
 #####################################################################
 
-qt_extend_target(rcc CONDITION QT_FEATURE_zstd AND NOT cross_compile
+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 cross_compile OR NOT QT_FEATURE_zstd
+qt_extend_target(rcc CONDITION CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_zstd
     DEFINES
         QT_FEATURE_zstd=-1
 )