summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/.prev_CMakeLists.txt66
-rw-r--r--src/corelib/CMakeLists.txt81
-rw-r--r--src/corelib/configure.cmake11
-rw-r--r--src/gui/.prev_CMakeLists.txt42
-rw-r--r--src/gui/CMakeLists.txt41
-rw-r--r--src/gui/configure.cmake4
-rw-r--r--src/network/.prev_CMakeLists.txt8
-rw-r--r--src/network/CMakeLists.txt10
-rw-r--r--src/opengl/CMakeLists.txt38
-rw-r--r--src/platformsupport/fontdatabases/.prev_CMakeLists.txt2
-rw-r--r--src/platformsupport/fontdatabases/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/cocoa/.prev_CMakeLists.txt10
-rw-r--r--src/plugins/platforms/cocoa/CMakeLists.txt10
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt1
-rw-r--r--src/plugins/styles/windowsvista/CMakeLists.txt13
-rw-r--r--src/tools/bootstrap/.prev_CMakeLists.txt5
-rw-r--r--src/tools/bootstrap/CMakeLists.txt5
-rw-r--r--src/widgets/.prev_CMakeLists.txt10
-rw-r--r--src/widgets/CMakeLists.txt10
-rw-r--r--src/widgets/configure.cmake2
20 files changed, 227 insertions, 144 deletions
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index f32ff1f8f3..5c287261fb 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -119,9 +119,10 @@ qt_add_module(Core
plugin/qpluginloader.cpp plugin/qpluginloader.h
plugin/quuid.cpp plugin/quuid.h
serialization/qcborarray.h
- serialization/qcborcommon.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
@@ -193,6 +194,7 @@ qt_add_module(Core
tools/qcontainertools_impl.h
tools/qcontiguouscache.cpp tools/qcontiguouscache.h
tools/qcryptographichash.cpp tools/qcryptographichash.h
+ tools/qflatmap_p.h
tools/qfreelist.cpp tools/qfreelist_p.h
tools/qhash.cpp tools/qhash.h
tools/qhashfunctions.h
@@ -780,6 +782,11 @@ qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
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
@@ -995,9 +1002,14 @@ qt_extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATUR
codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h
)
-qt_extend_target(Core CONDITION QT_FEATURE_cborstream
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
SOURCES
- serialization/qcborstream.cpp serialization/qcborstream.h
+ 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
@@ -1024,24 +1036,38 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype
mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h
)
-if(QT_FEATURE_mimetype AND QT_FEATURE_mimetype_database)
- # Resources:
- set_source_files_properties("mimetypes/mime/packages/freedesktop.org.xml"
- PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
- )
- set(mimetypes_resource_files
- "mime/packages/freedesktop.org.xml"
- )
+#### 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_add_resource(Core "mimetypes"
- PREFIX
- "/qt-project.org/qmime/packages"
- BASE
- "mimetypes"
- FILES
- ${mimetypes_resource_files}
- )
-endif()
+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
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 77f0d5a02d..5a0ef2eb4d 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -133,9 +133,10 @@ qt_add_module(Core
plugin/qpluginloader.cpp plugin/qpluginloader.h
plugin/quuid.cpp plugin/quuid.h
serialization/qcborarray.h
- serialization/qcborcommon.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
@@ -207,6 +208,7 @@ qt_add_module(Core
tools/qcontainertools_impl.h
tools/qcontiguouscache.cpp tools/qcontiguouscache.h
tools/qcryptographichash.cpp tools/qcryptographichash.h
+ tools/qflatmap_p.h
tools/qfreelist.cpp tools/qfreelist_p.h
tools/qhash.cpp tools/qhash.h
tools/qhashfunctions.h
@@ -856,6 +858,11 @@ qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_settings AND NOT NACL
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
@@ -1071,9 +1078,14 @@ qt_extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATUR
codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h
)
-qt_extend_target(Core CONDITION QT_FEATURE_cborstream
+qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader
SOURCES
- serialization/qcborstream.cpp serialization/qcborstream.h
+ 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
@@ -1100,6 +1112,40 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype
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
@@ -1108,7 +1154,36 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype
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" "${mime_dir}/hexdump.ps1" )
+ 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
diff --git a/src/corelib/configure.cmake b/src/corelib/configure.cmake
index 4e97964b8c..c316d1b90a 100644
--- a/src/corelib/configure.cmake
+++ b/src/corelib/configure.cmake
@@ -942,10 +942,15 @@ 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("cborstream" PUBLIC
+qt_feature("cborstreamreader" PUBLIC
SECTION "Utilities"
- LABEL "CBOR stream I/O"
- PURPOSE "Provides support for reading and writing the CBOR binary format. Note that this is required for plugin loading. Qt GUI needs QPA plugins for basic operation."
+ 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"
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 90b66fd882..75af1f1960 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -239,18 +239,6 @@ qt_add_resource(Gui "qpdf"
FILES
${qpdf_resource_files}
)
-set(qmake_webgradients_resource_files
- "painting/webgradients.binaryjson"
-)
-
-qt_add_resource(Gui "qmake_webgradients"
- PREFIX
- "qgradient"
- BASE
- "painting"
- FILES
- ${qmake_webgradients_resource_files}
-)
#### Keys ignored in scope 1:.:.:gui.pro:<TRUE>:
@@ -263,13 +251,11 @@ qt_add_resource(Gui "qmake_webgradients"
qt_extend_target(Gui CONDITION QT_FEATURE_opengl
SOURCES
kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
- kernel/qopenglwindow.cpp kernel/qopenglwindow.h
kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
opengl/qopengl2pexvertexarray.cpp opengl/qopengl2pexvertexarray_p.h
opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
opengl/qopenglcustomshaderstage.cpp opengl/qopenglcustomshaderstage_p.h
- opengl/qopengldebug.cpp opengl/qopengldebug.h
opengl/qopenglengineshadermanager.cpp opengl/qopenglengineshadermanager_p.h
opengl/qopenglengineshadersource_p.h
opengl/qopenglextensions_p.h
@@ -303,14 +289,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
# MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE"
qt_extend_target(Gui CONDITION APPLE_OSX
- SOURCES
- rhi/qrhimetal.mm rhi/qrhimetal_p.h
- rhi/qrhimetal_p_p.h
LIBRARIES
${FWAppKit}
PUBLIC_LIBRARIES
${FWAppKit}
- ${FWMetal}
)
qt_extend_target(Gui CONDITION APPLE
@@ -434,6 +416,14 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png
PNG::PNG
)
+#### 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
@@ -595,8 +585,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
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
- opengl/qopenglqueryhelper_p.h
- opengl/qopengltimerquery.cpp opengl/qopengltimerquery.h
)
qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2
@@ -616,7 +604,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
Vulkan::Vulkan_nolink
)
-#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
+#### 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"
@@ -632,10 +620,10 @@ qt_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 81:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
# qvkgen_h.variable_out = "HEADERS"
-#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else:
# qvkgen_h.CONFIG = "target_predeps" "no_link"
qt_extend_target(Gui CONDITION WASM
@@ -643,6 +631,14 @@ qt_extend_target(Gui CONDITION WASM
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
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index c3139c60b6..3c8f35f467 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -286,18 +286,6 @@ qt_add_resource(Gui "qpdf"
FILES
${qpdf_resource_files}
)
-set(qmake_webgradients_resource_files
- "painting/webgradients.binaryjson"
-)
-
-qt_add_resource(Gui "qmake_webgradients"
- PREFIX
- "/qgradient/" # special case
- #BASE # special case remove
- #"painting" # special case remove
- FILES
- ${qmake_webgradients_resource_files}
-)
# special case begin
# Replace arch_haswell with avx2 feature. That is what is used in the code requireing
@@ -345,13 +333,11 @@ endif()
qt_extend_target(Gui CONDITION QT_FEATURE_opengl
SOURCES
kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
- kernel/qopenglwindow.cpp kernel/qopenglwindow.h
kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
opengl/qopengl2pexvertexarray.cpp opengl/qopengl2pexvertexarray_p.h
opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
opengl/qopenglcustomshaderstage.cpp opengl/qopenglcustomshaderstage_p.h
- opengl/qopengldebug.cpp opengl/qopengldebug.h
opengl/qopenglengineshadermanager.cpp opengl/qopenglengineshadermanager_p.h
opengl/qopenglengineshadersource_p.h
opengl/qopenglextensions_p.h
@@ -385,14 +371,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
# MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE"
qt_extend_target(Gui CONDITION APPLE_OSX
- SOURCES
- rhi/qrhimetal.mm rhi/qrhimetal_p.h
- rhi/qrhimetal_p_p.h
LIBRARIES
${FWAppKit}
PUBLIC_LIBRARIES
${FWAppKit}
- ${FWMetal}
)
qt_extend_target(Gui CONDITION APPLE
@@ -516,6 +498,14 @@ qt_extend_target(Gui CONDITION QT_FEATURE_png
PNG::PNG
)
+#### 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
@@ -696,8 +686,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
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
- opengl/qopenglqueryhelper_p.h
- opengl/qopengltimerquery.cpp opengl/qopengltimerquery.h
)
qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2
@@ -725,6 +713,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
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.
@@ -780,10 +769,10 @@ add_custom_command(
# qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
# qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
-#### Keys ignored in scope 81:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
# qvkgen_h.variable_out = "HEADERS"
-#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else:
# qvkgen_h.CONFIG = "target_predeps" "no_link"
qt_extend_target(Gui CONDITION WASM
@@ -791,6 +780,14 @@ qt_extend_target(Gui CONDITION WASM
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
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
index 11723b785b..2b4ed24ba4 100644
--- a/src/gui/configure.cmake
+++ b/src/gui/configure.cmake
@@ -687,7 +687,7 @@ 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 AND NOT WASM
+ CONDITION QT_FEATURE_opengles2 AND NOT QT_FEATURE_angle AND TEST_opengles3
)
qt_feature_definition("opengles3" "QT_OPENGL_ES_3")
qt_feature("opengles31" PUBLIC
@@ -737,7 +737,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 ) AND ( QT_FEATURE_dlopen OR NOT UNIX )
+ 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
diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt
index 87bf4cefe3..a26fb735db 100644
--- a/src/network/.prev_CMakeLists.txt
+++ b/src/network/.prev_CMakeLists.txt
@@ -402,7 +402,13 @@ qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE
ssl/qsslsocket_openssl_android.cpp
)
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl
+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
)
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 8b2753e6ff..7ebe37c064 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -5,14 +5,12 @@
# proper implementation of additional compile tests for library dependencies
# in configure.json
-if (UNIX OR ANDROID)
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()
-endif()
# special case end
#####################################################################
@@ -417,7 +415,13 @@ qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE
ssl/qsslsocket_openssl_android.cpp
)
-qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl
+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
)
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index 85e382fa16..d490aa4970 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -6,22 +6,8 @@
qt_add_module(OpenGL
SOURCES
- gl2paintengineex/qgl2pexvertexarray.cpp gl2paintengineex/qgl2pexvertexarray_p.h
- gl2paintengineex/qglcustomshaderstage.cpp gl2paintengineex/qglcustomshaderstage_p.h
- gl2paintengineex/qglengineshadermanager.cpp gl2paintengineex/qglengineshadermanager_p.h
- gl2paintengineex/qglengineshadersource_p.h
- gl2paintengineex/qglgradientcache.cpp gl2paintengineex/qglgradientcache_p.h
- gl2paintengineex/qglshadercache_p.h
- gl2paintengineex/qpaintengineex_opengl2.cpp gl2paintengineex/qpaintengineex_opengl2_p.h
- gl2paintengineex/qtextureglyphcache_gl.cpp gl2paintengineex/qtextureglyphcache_gl_p.h
- qgl.cpp qgl.h qgl_p.h
- qglbuffer.cpp qglbuffer.h
- qglcolormap.cpp qglcolormap.h
- qglframebufferobject.cpp qglframebufferobject.h qglframebufferobject_p.h
- qglfunctions.cpp qglfunctions.h
- qglpaintdevice.cpp qglpaintdevice_p.h
- qglpixelbuffer.cpp qglpixelbuffer.h qglpixelbuffer_p.h
- qglshaderprogram.cpp qglshaderprogram.h
+ qopengldebug.cpp qopengldebug.h
+ qopenglwindow.cpp qopenglwindow.h
qtopenglglobal.h
DEFINES
QT_NO_FOREACH
@@ -29,27 +15,27 @@ qt_add_module(OpenGL
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
- Qt::WidgetsPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::Gui
- Qt::Widgets
)
## Scopes:
#####################################################################
-qt_extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
- LINK_OPTIONS
- "/BASE:0x63000000"
+qt_extend_target(OpenGL CONDITION QT_FEATURE_widgets
+ SOURCES
+ qopenglwidget.cpp qopenglwidget.h
+ LIBRARIES
+ Qt::WidgetsPrivate
+ PUBLIC_LIBRARIES
+ Qt::Widgets
)
-#### Keys ignored in scope 3:.:.:opengl.pro:solaris-cc_x_:
-# QMAKE_CXXFLAGS_RELEASE = "--O2"
-
-qt_extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect
+qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
SOURCES
- qgraphicsshadereffect.cpp qgraphicsshadereffect_p.h
+ qopenglqueryhelper_p.h
+ qopengltimerquery.cpp qopengltimerquery.h
)
qt_add_docs(OpenGL
doc/qtopengl.qdocconf
diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
index cdc85fc4c9..f6ee30269d 100644
--- a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
@@ -59,7 +59,7 @@ qt_extend_target(FontDatabaseSupport CONDITION UNIX
genericunix/qgenericunixfontdatabase_p.h
)
-qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig
SOURCES
fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h
fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h
diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt
index e17abc3f3a..271cdde5d4 100644
--- a/src/platformsupport/fontdatabases/CMakeLists.txt
+++ b/src/platformsupport/fontdatabases/CMakeLists.txt
@@ -62,7 +62,7 @@ qt_extend_target(FontDatabaseSupport CONDITION UNIX
genericunix/qgenericunixfontdatabase_p.h
)
-qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig AND UNIX
+qt_extend_target(FontDatabaseSupport CONDITION QT_FEATURE_fontconfig
SOURCES
fontconfig/qfontconfigdatabase.cpp fontconfig/qfontconfigdatabase_p.h
fontconfig/qfontenginemultifontconfig.cpp fontconfig/qfontenginemultifontconfig_p.h
diff --git a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
index b590c4fb98..27fe778f95 100644
--- a/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/.prev_CMakeLists.txt
@@ -31,7 +31,6 @@ qt_add_plugin(qcocoa
qcocoansmenu.h qcocoansmenu.mm
qcocoascreen.h qcocoascreen.mm
qcocoaservices.h qcocoaservices.mm
- qcocoasystemsettings.h qcocoasystemsettings.mm
qcocoasystemtrayicon.h qcocoasystemtrayicon.mm
qcocoatheme.h qcocoatheme.mm
qcocoawindow.h qcocoawindow.mm
@@ -112,6 +111,11 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility
Qt::AccessibilitySupport
)
+qt_extend_target(qcocoa CONDITION QT_FEATURE_sessionmanager
+ SOURCES
+ qcocoasessionmanager.cpp qcocoasessionmanager.h
+)
+
qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
SOURCES
qpaintengine_mac.mm qpaintengine_mac_p.h
@@ -121,7 +125,7 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
Qt::Widgets
)
-#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets:
+#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets:
# QT_FOR_CONFIG = "widgets"
qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
@@ -150,5 +154,5 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
)
-#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 12:.:.: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
index 0c76f99790..dbaea562a8 100644
--- a/src/plugins/platforms/cocoa/CMakeLists.txt
+++ b/src/plugins/platforms/cocoa/CMakeLists.txt
@@ -35,7 +35,6 @@ qt_add_plugin(qcocoa
qcocoansmenu.h qcocoansmenu.mm
qcocoascreen.h qcocoascreen.mm
qcocoaservices.h qcocoaservices.mm
- qcocoasystemsettings.h qcocoasystemsettings.mm
qcocoasystemtrayicon.h qcocoasystemtrayicon.mm
qcocoatheme.h qcocoatheme.mm
qcocoawindow.h qcocoawindow.mm
@@ -116,6 +115,11 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_accessibility
Qt::AccessibilitySupport
)
+qt_extend_target(qcocoa CONDITION QT_FEATURE_sessionmanager
+ SOURCES
+ qcocoasessionmanager.cpp qcocoasessionmanager.h
+)
+
qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
SOURCES
qpaintengine_mac.mm qpaintengine_mac_p.h
@@ -125,7 +129,7 @@ qt_extend_target(qcocoa CONDITION TARGET Qt::Widgets
Qt::Widgets
)
-#### Keys ignored in scope 6:.:.:cocoa.pro:TARGET Qt::Widgets:
+#### Keys ignored in scope 7:.:.:cocoa.pro:TARGET Qt::Widgets:
# QT_FOR_CONFIG = "widgets"
qt_extend_target(qcocoa CONDITION TARGET Qt::PrintSupport AND TARGET Qt::Widgets
@@ -154,5 +158,5 @@ qt_extend_target(qcocoa CONDITION QT_FEATURE_fontdialog AND TARGET Qt::Widgets
qcocoafontdialoghelper.h qcocoafontdialoghelper.mm
)
-#### Keys ignored in scope 11:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
+#### Keys ignored in scope 12:.:.:cocoa.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
# PLUGIN_EXTENDS = "-"
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
index 2e8819182c..51b3327345 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_add_module(EglFsKmsSupport
NO_MODULE_HEADERS
SOURCES
qeglfskmsdevice.cpp qeglfskmsdevice.h
+ qeglfskmseventreader.cpp qeglfskmseventreader.h
qeglfskmshelpers.h
qeglfskmsintegration.cpp qeglfskmsintegration.h
qeglfskmsscreen.cpp qeglfskmsscreen.h
diff --git a/src/plugins/styles/windowsvista/CMakeLists.txt b/src/plugins/styles/windowsvista/CMakeLists.txt
index bbb9210f10..3304150c3e 100644
--- a/src/plugins/styles/windowsvista/CMakeLists.txt
+++ b/src/plugins/styles/windowsvista/CMakeLists.txt
@@ -13,12 +13,11 @@ 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
@@ -27,13 +26,3 @@ 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 40d2e85cef..e43c5eb350 100644
--- a/src/tools/bootstrap/.prev_CMakeLists.txt
+++ b/src/tools/bootstrap/.prev_CMakeLists.txt
@@ -53,6 +53,8 @@ qt_add_module(Bootstrap
../../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
@@ -105,6 +107,9 @@ qt_add_module(Bootstrap
QT_VERSION_MINOR=
QT_VERSION_PATCH=
QT_VERSION_STR=\"\"
+ INCLUDE_DIRECTORIES
+ ..
+ ../../3rdparty/tinycbor/src
)
#### Keys ignored in scope 1:.:.:bootstrap.pro:<TRUE>:
diff --git a/src/tools/bootstrap/CMakeLists.txt b/src/tools/bootstrap/CMakeLists.txt
index 7762ef4ae4..2121faae12 100644
--- a/src/tools/bootstrap/CMakeLists.txt
+++ b/src/tools/bootstrap/CMakeLists.txt
@@ -51,6 +51,8 @@ qt_extend_target(Bootstrap
../../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
@@ -104,6 +106,9 @@ qt_extend_target(Bootstrap
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>
$<TARGET_PROPERTY:Xml,INCLUDE_DIRECTORIES>
diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt
index c53bb3928f..e8b01ff99c 100644
--- a/src/widgets/.prev_CMakeLists.txt
+++ b/src/widgets/.prev_CMakeLists.txt
@@ -300,11 +300,6 @@ qt_extend_target(Widgets CONDITION APPLE_OSX
z
)
-qt_extend_target(Widgets CONDITION WIN32
- INCLUDE_DIRECTORIES
- ../3rdparty/wintab
-)
-
qt_extend_target(Widgets CONDITION WIN32 AND NOT WINRT
LIBRARIES
dwmapi
@@ -325,11 +320,6 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_action
kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
)
-qt_extend_target(Widgets CONDITION QT_FEATURE_opengl
- SOURCES
- kernel/qopenglwidget.cpp kernel/qopenglwidget.h
-)
-
qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout
SOURCES
kernel/qformlayout.cpp kernel/qformlayout.h
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 35c6c60ae6..a7ba83bde8 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -302,11 +302,6 @@ qt_extend_target(Widgets CONDITION APPLE_OSX
z
)
-qt_extend_target(Widgets CONDITION WIN32
- INCLUDE_DIRECTORIES
- ../3rdparty/wintab
-)
-
qt_extend_target(Widgets CONDITION WIN32 AND NOT WINRT
LIBRARIES
dwmapi
@@ -327,11 +322,6 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_action
kernel/qwidgetaction.cpp kernel/qwidgetaction.h kernel/qwidgetaction_p.h
)
-qt_extend_target(Widgets CONDITION QT_FEATURE_opengl
- SOURCES
- kernel/qopenglwidget.cpp kernel/qopenglwidget.h
-)
-
qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout
SOURCES
kernel/qformlayout.cpp kernel/qformlayout.h
diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake
index c508e2dbf4..25af8aea8a 100644
--- a/src/widgets/configure.cmake
+++ b/src/widgets/configure.cmake
@@ -32,7 +32,7 @@ qt_feature("style-windows" PRIVATE
)
qt_feature("style-windowsvista" PRIVATE
LABEL "WindowsVista"
- CONDITION QT_FEATURE_style_windows AND QT_FEATURE_animation AND WIN32 AND NOT WINRT AND tests.uxtheme OR FIXME
+ CONDITION QT_FEATURE_style_windows AND QT_FEATURE_animation AND WIN32 AND NOT WINRT
)
qt_feature("style-android" PRIVATE
LABEL "Android"
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 13:47:09 +0000