AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Post merge fixes

Browse Source 
Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Leander Beernaert 2019-11-20 09:25:19 +01:00
parent bc1cae774a
commit 1c655fb0fc
60 changed files with 346 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qmake/.prev_CMakeLists.txt
View File

@ -30,8 +30,10 @@ qt_add_executable(qmake
../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h
../src/corelib/kernel/qvariant.cpp
../src/corelib/plugin/quuid.cpp ../src/corelib/plugin/quuid.h
../src/corelib/serialization/qjson.cpp ../src/corelib/serialization/qjson_p.h
../src/corelib/serialization/qcborvalue.cpp ../src/corelib/serialization/qcborvalue.h ../src/corelib/serialization/qcborvalue_p.h
../src/corelib/serialization/qjson_p.h
../src/corelib/serialization/qjsonarray.cpp ../src/corelib/serialization/qjsonarray.h
../src/corelib/serialization/qjsoncbor.cpp
../src/corelib/serialization/qjsondocument.cpp ../src/corelib/serialization/qjsondocument.h
../src/corelib/serialization/qjsonobject.cpp ../src/corelib/serialization/qjsonobject.h
../src/corelib/serialization/qjsonparser.cpp ../src/corelib/serialization/qjsonparser_p.h

4
qmake/CMakeLists.txt
View File

@ -37,8 +37,10 @@ qt_add_tool(qmake # special case
../src/corelib/kernel/qsystemerror.cpp ../src/corelib/kernel/qsystemerror_p.h
../src/corelib/kernel/qvariant.cpp
../src/corelib/plugin/quuid.cpp ../src/corelib/plugin/quuid.h
../src/corelib/serialization/qjson.cpp ../src/corelib/serialization/qjson_p.h
../src/corelib/serialization/qcborvalue.cpp ../src/corelib/serialization/qcborvalue.h ../src/corelib/serialization/qcborvalue_p.h
../src/corelib/serialization/qjson_p.h
../src/corelib/serialization/qjsonarray.cpp ../src/corelib/serialization/qjsonarray.h
../src/corelib/serialization/qjsoncbor.cpp
../src/corelib/serialization/qjsondocument.cpp ../src/corelib/serialization/qjsondocument.h
../src/corelib/serialization/qjsonobject.cpp ../src/corelib/serialization/qjsonobject.h
../src/corelib/serialization/qjsonparser.cpp ../src/corelib/serialization/qjsonparser_p.h

32
src/corelib/.prev_CMakeLists.txt
View File

@ -123,7 +123,7 @@ qt_add_module(Core
serialization/qcbormap.h
serialization/qcborvalue.cpp serialization/qcborvalue.h serialization/qcborvalue_p.h
serialization/qdatastream.cpp serialization/qdatastream.h serialization/qdatastream_p.h
serialization/qjson.cpp serialization/qjson_p.h
serialization/qjson_p.h
serialization/qjsonarray.cpp serialization/qjsonarray.h
serialization/qjsoncbor.cpp
serialization/qjsondocument.cpp serialization/qjsondocument.h
@ -416,27 +416,27 @@ qt_extend_target(Core CONDITION INTEGRITY
--pending_instantiations=128
)
#### Keys ignored in scope 14:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_HOST_DATA_DIR):
#### Keys ignored in scope 15:.:.: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 15:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_INSTALL_DATA_DIR):
#### Keys ignored in scope 16:.:.: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 19:.:global:global/global.pri:QT_CPU_FEATURES__ss_QT_ARCH___contains___f16c:
#### Keys ignored in scope 21:.:global:global/global.pri:QT_CPU_FEATURES__ss_QT_ARCH___contains___f16c:
# f16c_cxx = "true"
#### Keys ignored in scope 21:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
#### Keys ignored in scope 23:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
# f16c_cxx = "false"
#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
#### Keys ignored in scope 25:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
# f16c_cxx = "true"
#### Keys ignored in scope 25:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
#### Keys ignored in scope 27:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
# f16c_cxx = "true"
#### Keys ignored in scope 26:.:global:global/global.pri:else:
#### Keys ignored in scope 28:.:global:global/global.pri:else:
# f16c_cxx = "false"
qt_extend_target(Core CONDITION _ss_f16c_cxx
@ -463,7 +463,7 @@ qt_extend_target(Core CONDITION LINUX AND NOT static
global/minimum-linux_p.h
)
#### Keys ignored in scope 33:.:global:global/global.pri:precompile_header:
#### Keys ignored in scope 35:.: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}"
@ -472,7 +472,7 @@ qt_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 34:.:global:global/global.pri:silent:
#### Keys ignored in scope 36:.:global:global/global.pri:silent:
# no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&"
qt_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static
@ -490,7 +490,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_journald
PkgConfig::Libsystemd
)
#### Keys ignored in scope 38:.:global:global/global.pri:GCC AND ltcg:
#### Keys ignored in scope 40:.: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"
@ -499,7 +499,7 @@ qt_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 39:.:global:global/global.pri:silent:
#### Keys ignored in scope 41:.:global:global/global.pri:silent:
# versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&"
qt_extend_target(Core CONDITION NOT GCC OR NOT ltcg
@ -999,6 +999,14 @@ qt_extend_target(Core CONDITION QT_FEATURE_cborstream
serialization/qcborstream.cpp serialization/qcborstream.h
)
qt_extend_target(Core CONDITION QT_FEATURE_binaryjson
SOURCES
serialization/qbinaryjson.cpp serialization/qbinaryjson_p.h
serialization/qbinaryjsonarray.cpp serialization/qbinaryjsonarray_p.h
serialization/qbinaryjsonobject.cpp serialization/qbinaryjsonobject_p.h
serialization/qbinaryjsonvalue.cpp serialization/qbinaryjsonvalue_p.h
)
qt_extend_target(Core CONDITION QT_FEATURE_qeventtransition
SOURCES
statemachine/qeventtransition.cpp statemachine/qeventtransition.h statemachine/qeventtransition_p.h

32
src/corelib/CMakeLists.txt
View File

@ -137,7 +137,7 @@ qt_add_module(Core
serialization/qcbormap.h
serialization/qcborvalue.cpp serialization/qcborvalue.h serialization/qcborvalue_p.h
serialization/qdatastream.cpp serialization/qdatastream.h serialization/qdatastream_p.h
serialization/qjson.cpp serialization/qjson_p.h
serialization/qjson_p.h
serialization/qjsonarray.cpp serialization/qjsonarray.h
serialization/qjsoncbor.cpp
serialization/qjsondocument.cpp serialization/qjsondocument.h
@ -499,27 +499,27 @@ qt_extend_target(Core CONDITION INTEGRITY
--pending_instantiations=128
)
#### Keys ignored in scope 14:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_HOST_DATA_DIR):
#### Keys ignored in scope 15:.:.: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 15:.:.:corelib.pro:pathIsAbsolute(_ss_CMAKE_INSTALL_DATA_DIR):
#### Keys ignored in scope 16:.:.: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 19:.:global:global/global.pri:QT_CPU_FEATURES__ss_QT_ARCH___contains___f16c:
#### Keys ignored in scope 21:.:global:global/global.pri:QT_CPU_FEATURES__ss_QT_ARCH___contains___f16c:
# f16c_cxx = "true"
#### Keys ignored in scope 21:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
#### Keys ignored in scope 23:.:global:global/global.pri:CLANG OR intel_icl OR ICC:
# f16c_cxx = "false"
#### Keys ignored in scope 23:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
#### Keys ignored in scope 25:.:global:global/global.pri:GCC AND f16c AND x86SimdAlways:
# f16c_cxx = "true"
#### Keys ignored in scope 25:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
#### Keys ignored in scope 27:.:global:global/global.pri:MSVC AND QT_CPU_FEATURES__ss_QT_ARCH___contains___avx:
# f16c_cxx = "true"
#### Keys ignored in scope 26:.:global:global/global.pri:else:
#### Keys ignored in scope 28:.:global:global/global.pri:else:
# f16c_cxx = "false"
# extend_target(Core CONDITION _ss_f16c_cxx ... # special case remove: Handled manually
@ -539,7 +539,7 @@ qt_extend_target(Core CONDITION LINUX AND NOT static
global/minimum-linux_p.h
)
#### Keys ignored in scope 33:.:global:global/global.pri:precompile_header:
#### Keys ignored in scope 35:.: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}"
@ -548,7 +548,7 @@ qt_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 34:.:global:global/global.pri:silent:
#### Keys ignored in scope 36:.:global:global/global.pri:silent:
# no_pch_assembler.commands = "@echo" "compiling[no_pch]" "${QMAKE_FILE_IN}" "&&"
qt_extend_target(Core CONDITION LINUX AND NOT precompile_header AND NOT static
@ -566,7 +566,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_journald
PkgConfig::Libsystemd
)
#### Keys ignored in scope 38:.:global:global/global.pri:GCC AND ltcg:
#### Keys ignored in scope 40:.: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"
@ -575,7 +575,7 @@ qt_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 39:.:global:global/global.pri:silent:
#### Keys ignored in scope 41:.:global:global/global.pri:silent:
# versiontagging_compiler.commands = "@echo" "compiling[versiontagging]" "${QMAKE_FILE_IN}" "&&"
qt_extend_target(Core CONDITION NOT GCC OR NOT ltcg
@ -1075,6 +1075,14 @@ qt_extend_target(Core CONDITION QT_FEATURE_cborstream
serialization/qcborstream.cpp serialization/qcborstream.h
)
qt_extend_target(Core CONDITION QT_FEATURE_binaryjson
SOURCES
serialization/qbinaryjson.cpp serialization/qbinaryjson_p.h
serialization/qbinaryjsonarray.cpp serialization/qbinaryjsonarray_p.h
serialization/qbinaryjsonobject.cpp serialization/qbinaryjsonobject_p.h
serialization/qbinaryjsonvalue.cpp serialization/qbinaryjsonvalue_p.h
)
qt_extend_target(Core CONDITION QT_FEATURE_qeventtransition
SOURCES
statemachine/qeventtransition.cpp statemachine/qeventtransition.h statemachine/qeventtransition_p.h

11
src/corelib/configure.cmake
View File

@ -682,6 +682,12 @@ qt_feature("sharedmemory" PUBLIC
CONDITION ( ANDROID OR WIN32 OR ( NOT VXWORKS AND ( TEST_ipc_sysv OR TEST_ipc_posix ) ) )
)
qt_feature_definition("sharedmemory" "QT_NO_SHAREDMEMORY" NEGATE VALUE "1")
qt_feature("shortcut" PUBLIC
SECTION "Kernel"
LABEL "QShortcut"
PURPOSE "Provides keyboard accelerators and shortcuts."
)
qt_feature_definition("shortcut" "QT_NO_SHORTCUT" NEGATE VALUE "1")
qt_feature("systemsemaphore" PUBLIC
SECTION "Kernel"
LABEL "QSystemSemaphore"
@ -934,3 +940,8 @@ qt_feature("cborstream" PUBLIC
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."
)
qt_feature("binaryjson" PUBLIC
SECTION "Utilities"
LABEL "Binary JSON (deprecated)"
PURPOSE "Provides support for the deprecated binary JSON format."
)

21
src/gui/.prev_CMakeLists.txt
View File

@ -44,7 +44,6 @@ qt_add_module(Gui
kernel/qinputmethod.cpp kernel/qinputmethod.h kernel/qinputmethod_p.h
kernel/qinternalmimedata.cpp kernel/qinternalmimedata_p.h
kernel/qkeymapper.cpp kernel/qkeymapper_p.h
kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
kernel/qoffscreensurface.cpp kernel/qoffscreensurface.h
kernel/qpaintdevicewindow.cpp kernel/qpaintdevicewindow.h kernel/qpaintdevicewindow_p.h
kernel/qpalette.cpp kernel/qpalette.h
@ -76,7 +75,6 @@ qt_add_module(Gui
kernel/qrasterwindow.cpp kernel/qrasterwindow.h
kernel/qscreen.cpp kernel/qscreen.h kernel/qscreen_p.h
kernel/qsessionmanager.cpp kernel/qsessionmanager.h kernel/qsessionmanager_p.h
kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
kernel/qstylehints.cpp kernel/qstylehints.h
kernel/qsurface.cpp kernel/qsurface.h
kernel/qsurfaceformat.cpp kernel/qsurfaceformat.h
@ -396,6 +394,12 @@ qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
${FWFoundation}
)
qt_extend_target(Gui CONDITION QT_FEATURE_action
SOURCES
kernel/qguiaction.cpp kernel/qguiaction.h kernel/qguiaction_p.h
kernel/qguiactiongroup.cpp kernel/qguiactiongroup.h kernel/qguiactiongroup_p.h
)
qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
SOURCES
kernel/qdnd.cpp kernel/qdnd_p.h
@ -405,6 +409,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h
)
qt_extend_target(Gui CONDITION QT_FEATURE_shortcut
SOURCES
kernel/qguishortcut.cpp kernel/qguishortcut.h kernel/qguishortcut_p.h
kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
)
qt_extend_target(Gui CONDITION QT_FEATURE_movie
SOURCES
image/qmovie.cpp image/qmovie.h
@ -604,7 +615,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
Vulkan::Vulkan_nolink
)
#### Keys ignored in scope 78:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
#### Keys ignored in scope 80:.: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"
@ -620,10 +631,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 79:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
#### Keys ignored in scope 81:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
# qvkgen_h.variable_out = "HEADERS"
#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:else:
#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:else:
# qvkgen_h.CONFIG = "target_predeps" "no_link"
qt_extend_target(Gui CONDITION WASM

19
src/gui/CMakeLists.txt
View File

@ -87,7 +87,6 @@ qt_add_module(Gui
kernel/qinputmethod.cpp kernel/qinputmethod.h kernel/qinputmethod_p.h
kernel/qinternalmimedata.cpp kernel/qinternalmimedata_p.h
kernel/qkeymapper.cpp kernel/qkeymapper_p.h
kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
kernel/qoffscreensurface.cpp kernel/qoffscreensurface.h
kernel/qpaintdevicewindow.cpp kernel/qpaintdevicewindow.h kernel/qpaintdevicewindow_p.h
kernel/qpalette.cpp kernel/qpalette.h
@ -119,7 +118,6 @@ qt_add_module(Gui
kernel/qrasterwindow.cpp kernel/qrasterwindow.h
kernel/qscreen.cpp kernel/qscreen.h kernel/qscreen_p.h
kernel/qsessionmanager.cpp kernel/qsessionmanager.h kernel/qsessionmanager_p.h
kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
kernel/qstylehints.cpp kernel/qstylehints.h
kernel/qsurface.cpp kernel/qsurface.h
kernel/qsurfaceformat.cpp kernel/qsurfaceformat.h
@ -478,6 +476,12 @@ qt_extend_target(Gui CONDITION APPLE AND QT_FEATURE_accessibility
${FWFoundation}
)
qt_extend_target(Gui CONDITION QT_FEATURE_action
SOURCES
kernel/qguiaction.cpp kernel/qguiaction.h kernel/qguiaction_p.h
kernel/qguiactiongroup.cpp kernel/qguiactiongroup.h kernel/qguiactiongroup_p.h
)
qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
SOURCES
kernel/qdnd.cpp kernel/qdnd_p.h
@ -487,6 +491,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_draganddrop
kernel/qsimpledrag.cpp kernel/qsimpledrag_p.h
)
qt_extend_target(Gui CONDITION QT_FEATURE_shortcut
SOURCES
kernel/qguishortcut.cpp kernel/qguishortcut.h kernel/qguishortcut_p.h
kernel/qkeysequence.cpp kernel/qkeysequence.h kernel/qkeysequence_p.h
kernel/qshortcutmap.cpp kernel/qshortcutmap_p.h
)
qt_extend_target(Gui CONDITION QT_FEATURE_movie
SOURCES
image/qmovie.cpp image/qmovie.h
@ -746,10 +757,10 @@ endif()
# qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
# qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
#### Keys ignored in scope 79:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
#### Keys ignored in scope 81:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
# qvkgen_h.variable_out = "HEADERS"
#### Keys ignored in scope 80:.:vulkan:vulkan/vulkan.pri:else:
#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:else:
# qvkgen_h.CONFIG = "target_predeps" "no_link"
qt_extend_target(Gui CONDITION WASM

10
src/gui/configure.cmake
View File

@ -918,16 +918,10 @@ qt_feature("draganddrop" PUBLIC
CONDITION QT_FEATURE_imageformat_xpm
)
qt_feature_definition("draganddrop" "QT_NO_DRAGANDDROP" NEGATE VALUE "1")
qt_feature("shortcut" PUBLIC
SECTION "Kernel"
LABEL "QShortcut"
PURPOSE "Provides keyboard accelerators and shortcuts."
)
qt_feature_definition("shortcut" "QT_NO_SHORTCUT" NEGATE VALUE "1")
qt_feature("action" PUBLIC
SECTION "Kernel"
LABEL "QAction"
PURPOSE "Provides widget actions."
LABEL "Q(Gui)Action(Group)"
PURPOSE "Provides abstract user interface actions."
)
qt_feature_definition("action" "QT_NO_ACTION" NEGATE VALUE "1")
qt_feature("cursor" PUBLIC

18
src/network/.prev_CMakeLists.txt
View File

@ -378,6 +378,8 @@ qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
ssl/qsslkey_openssl.cpp
ssl/qsslsocket_openssl.cpp ssl/qsslsocket_openssl_p.h
ssl/qsslsocket_openssl_symbols.cpp ssl/qsslsocket_openssl_symbols_p.h
DEFINES
OPENSSL_API_COMPAT=0x10100000L
)
qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl
@ -390,22 +392,6 @@ qt_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT
ssl/qocsp_p.h
)
qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND QT_FEATURE_ssl
SOURCES
ssl/qsslcontext_openssl11.cpp
ssl/qsslsocket_openssl11.cpp
ssl/qsslsocket_openssl11_symbols_p.h
DEFINES
OPENSSL_API_COMPAT=0x10100000L
)
qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_opensslv11
SOURCES
ssl/qsslcontext_opensslpre11.cpp
ssl/qsslsocket_opensslpre11.cpp
ssl/qsslsocket_opensslpre11_symbols_p.h
)
qt_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl
SOURCES
ssl/qsslsocket_mac_shared.cpp

33
src/network/CMakeLists.txt
View File

@ -1,5 +1,20 @@
# Generated from network.pro.
# special case begin
# Temporary fix for OpenSSL feature detection until we can provide a
# 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
#####################################################################
## Network Module:
#####################################################################
@ -378,6 +393,8 @@ qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl
ssl/qsslkey_openssl.cpp
ssl/qsslsocket_openssl.cpp ssl/qsslsocket_openssl_p.h
ssl/qsslsocket_openssl_symbols.cpp ssl/qsslsocket_openssl_symbols_p.h
DEFINES
OPENSSL_API_COMPAT=0x10100000L
)
qt_extend_target(Network CONDITION QT_FEATURE_dtls AND QT_FEATURE_openssl AND QT_FEATURE_ssl
@ -390,22 +407,6 @@ qt_extend_target(Network CONDITION QT_FEATURE_ocsp AND QT_FEATURE_openssl AND QT
ssl/qocsp_p.h
)
qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_opensslv11 AND QT_FEATURE_ssl
SOURCES
ssl/qsslcontext_openssl11.cpp
ssl/qsslsocket_openssl11.cpp
ssl/qsslsocket_openssl11_symbols_p.h
DEFINES
OPENSSL_API_COMPAT=0x10100000L
)
qt_extend_target(Network CONDITION QT_FEATURE_openssl AND QT_FEATURE_ssl AND NOT QT_FEATURE_opensslv11
SOURCES
ssl/qsslcontext_opensslpre11.cpp
ssl/qsslsocket_opensslpre11.cpp
ssl/qsslsocket_opensslpre11_symbols_p.h
)
qt_extend_target(Network CONDITION APPLE AND QT_FEATURE_openssl AND QT_FEATURE_ssl
SOURCES
ssl/qsslsocket_mac_shared.cpp

23
src/network/configure.cmake
View File

@ -112,27 +112,6 @@ socklen_t sctpInitMsgSize = sizeof(sctpInitMsg);
"# FIXME: use: unmapped library: network
)
# openssl11
qt_config_compile_test(openssl11
LABEL "OpenSSL 1.1 support"
LIBRARIES
OpenSSL::SSL
CODE
"
#include <openssl/opensslv.h>
#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L
# error OpenSSL >= 1.1 is required
#endif
int main(int argc, char **argv)
{
(void)argc; (void)argv;
/* BEGIN TEST: */
/* END TEST: */
return 0;
}
")
# dtls
qt_config_compile_test(dtls
LABEL "DTLS support in OpenSSL"
@ -279,7 +258,7 @@ qt_feature("ocsp" PUBLIC
)
qt_feature("opensslv11" PUBLIC
LABEL "OpenSSL 1.1"
CONDITION QT_FEATURE_openssl AND ( OPENSSL_VERSION VERSION_GREATER_EQUAL "1.1.0" )
CONDITION QT_FEATURE_openssl
)
qt_feature("sctp" PUBLIC
LABEL "SCTP"

5
src/platformsupport/CMakeLists.txt
View File

@ -5,6 +5,11 @@ add_subdirectory(eventdispatchers)
add_subdirectory(devicediscovery)
add_subdirectory(fbconvenience)
add_subdirectory(themes)
# special case begin
if (QT_FEATURE_dbus)
add_subdirectory(linuxofono)
endif()
# special case end
if(APPLE OR QT_FEATURE_freetype OR WIN32)
add_subdirectory(fontdatabases)
endif()

23
src/platformsupport/input/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## InputSupport Module:
#####################################################################
add_qt_module(InputSupport
qt_add_module(InputSupport
STATIC
INTERNAL_MODULE
DEFINES
@ -23,12 +23,11 @@ add_qt_module(InputSupport
#### Keys ignored in scope 3:.:.:input-support.pro:<TRUE>:
# MODULE = "input_support"
# _LOADED = "qt_module"
## Scopes:
#####################################################################
extend_target(InputSupport CONDITION QT_FEATURE_evdev
qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev
SOURCES
evdevkeyboard/qevdevkeyboard_defaultmap_p.h
evdevkeyboard/qevdevkeyboardhandler.cpp evdevkeyboard/qevdevkeyboardhandler_p.h
@ -41,35 +40,35 @@ extend_target(InputSupport CONDITION QT_FEATURE_evdev
evdevtouch/../shared
)
extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_tabletevent
SOURCES
evdevtablet/qevdevtablethandler.cpp evdevtablet/qevdevtablethandler_p.h
evdevtablet/qevdevtabletmanager.cpp evdevtablet/qevdevtabletmanager_p.h
)
extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev AND QT_FEATURE_tabletevent
LIBRARIES
PkgConfig::Libudev
)
extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_libudev
LIBRARIES
PkgConfig::Libudev
)
extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev AND QT_FEATURE_mtdev
LIBRARIES
PkgConfig::Mtdev
)
extend_target(InputSupport CONDITION QT_FEATURE_tslib
qt_extend_target(InputSupport CONDITION QT_FEATURE_tslib
SOURCES
tslib/qtslib.cpp tslib/qtslib_p.h
PUBLIC_LIBRARIES
PkgConfig::Tslib
)
extend_target(InputSupport CONDITION QT_FEATURE_libinput
qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput
SOURCES
libinput/qlibinputhandler.cpp libinput/qlibinputhandler_p.h
libinput/qlibinputkeyboard.cpp libinput/qlibinputkeyboard_p.h
@ -82,7 +81,7 @@ extend_target(InputSupport CONDITION QT_FEATURE_libinput
PkgConfig::Libudev
)
extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
qt_extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommon
LIBRARIES
Qt::XkbCommonSupportPrivate
XKB::XKB
@ -90,14 +89,14 @@ extend_target(InputSupport CONDITION QT_FEATURE_libinput AND QT_FEATURE_xkbcommo
Qt::XkbCommonSupport
)
extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
qt_extend_target(InputSupport CONDITION QT_FEATURE_evdev OR QT_FEATURE_libinput
SOURCES
shared/devicehandlerlist_p.h
shared/qevdevutil.cpp shared/qevdevutil_p.h
shared/qtouchoutputmapping.cpp shared/qtouchoutputmapping_p.h
)
extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
qt_extend_target(InputSupport CONDITION QT_FEATURE_integrityhid
SOURCES
integrityhid/qintegrityhidmanager.cpp integrityhid/qintegrityhidmanager.h
LIBRARIES

1
src/platformsupport/input/CMakeLists.txt
View File

@ -28,7 +28,6 @@ qt_add_module(InputSupport
#### Keys ignored in scope 3:.:.:input-support.pro:<TRUE>:
# MODULE = "input_support"
# _LOADED = "qt_module"
## Scopes:
#####################################################################

20
src/platformsupport/linuxofono/CMakeLists.txt Normal file
View File

@ -0,0 +1,20 @@
# Generated from linuxofono.pro.
#####################################################################
## LinuxOfonoSupport Module:
#####################################################################
add_qt_module(LinuxOfonoSupport
STATIC
INTERNAL_MODULE
SOURCES
qofonoservice_linux.cpp qofonoservice_linux_p.h
DEFINES
QT_NO_CAST_FROM_ASCII
PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
)
#### Keys ignored in scope 1:.:.:linuxofono.pro:<TRUE>:
# MODULE = "linuxofono_support"

3
src/plugins/bearer/connman/.prev_CMakeLists.txt
View File

@ -8,15 +8,16 @@ qt_add_plugin(qconnmanbearer
TYPE bearer
CLASS_NAME QConnmanEnginePlugin
SOURCES
../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
main.cpp
qconnmanengine.cpp qconnmanengine.h
qconnmanservice_linux.cpp qconnmanservice_linux_p.h
LIBRARIES
Qt::LinuxOfonoSupportPrivate
Qt::NetworkPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
Qt::LinuxOfonoSupport
Qt::Network
)

3
src/plugins/bearer/connman/CMakeLists.txt
View File

@ -9,15 +9,16 @@ qt_add_plugin(qconnmanbearer
DEFAULT_IF False # special case QTBUG-78164
CLASS_NAME QConnmanEnginePlugin
SOURCES
../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
main.cpp
qconnmanengine.cpp qconnmanengine.h
qconnmanservice_linux.cpp qconnmanservice_linux_p.h
LIBRARIES
Qt::LinuxOfonoSupportPrivate
Qt::NetworkPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
Qt::LinuxOfonoSupport
Qt::Network
)

3
src/plugins/bearer/networkmanager/.prev_CMakeLists.txt
View File

@ -8,15 +8,16 @@ qt_add_plugin(qnmbearer
TYPE bearer
CLASS_NAME QNetworkManagerEnginePlugin
SOURCES
../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
main.cpp
qnetworkmanagerengine.cpp qnetworkmanagerengine.h
qnetworkmanagerservice.cpp qnetworkmanagerservice.h
LIBRARIES
Qt::LinuxOfonoSupportPrivate
Qt::NetworkPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
Qt::LinuxOfonoSupport
Qt::Network
)

3
src/plugins/bearer/networkmanager/CMakeLists.txt
View File

@ -9,15 +9,16 @@ qt_add_plugin(qnmbearer
DEFAULT_IF False # special case QTBUG-78164
CLASS_NAME QNetworkManagerEnginePlugin
SOURCES
../linux_common/qofonoservice_linux.cpp ../linux_common/qofonoservice_linux_p.h
main.cpp
qnetworkmanagerengine.cpp qnetworkmanagerengine.h
qnetworkmanagerservice.cpp qnetworkmanagerservice.h
LIBRARIES
Qt::LinuxOfonoSupportPrivate
Qt::NetworkPrivate
PUBLIC_LIBRARIES
Qt::Core
Qt::DBus
Qt::LinuxOfonoSupport
Qt::Network
)

20
src/plugins/platforms/eglfs/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## EglFSDeviceIntegration Module:
#####################################################################
add_qt_module(EglFSDeviceIntegration
qt_add_module(EglFSDeviceIntegration
INTERNAL_MODULE
SOURCES
api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h
@ -43,43 +43,42 @@ add_qt_module(EglFSDeviceIntegration
#### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>:
# MODULE = "eglfsdeviceintegration"
# _LOADED = "qt_module"
## Scopes:
#####################################################################
extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate
LIBRARIES
Qt::InputSupportPrivate
PUBLIC_LIBRARIES
Qt::InputSupport
)
extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate
qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate
LIBRARIES
Qt::PlatformCompositorSupportPrivate
PUBLIC_LIBRARIES
Qt::PlatformCompositorSupport
)
extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY
DEFINES
EGLFS_PLATFORM_HOOKS
)
extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY
qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY
DEFINES
EGLFS_PREFERRED_PLUGIN=
)
if(NOT DEFINES___contains___QT_NO_CURSOR)
if(QT_FEATURE_cursor)
# Resources:
set(cursor_resource_files
"cursor-atlas.png"
"cursor.json"
)
add_qt_resource(EglFSDeviceIntegration "cursor"
qt_add_resource(EglFSDeviceIntegration "cursor"
PREFIX
"/"
FILES
@ -87,7 +86,7 @@ if(NOT DEFINES___contains___QT_NO_CURSOR)
)
endif()
extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
SOURCES
api/qeglfscontext.cpp api/qeglfscontext_p.h
api/qeglfscursor.cpp api/qeglfscursor_p.h
@ -96,7 +95,7 @@ extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl
## qeglfs Plugin:
#####################################################################
add_qt_plugin(qeglfs
qt_add_plugin(qeglfs
TYPE platforms
CLASS_NAME QEglFSIntegrationPlugin
SOURCES
@ -113,7 +112,6 @@ add_qt_plugin(qeglfs
#### Keys ignored in scope 11:.:.:eglfs-plugin.pro:<TRUE>:
# OTHER_FILES = "$$PWD/eglfs.json"
# _LOADED = "qt_plugin"
## Scopes:
#####################################################################

2
src/plugins/platforms/eglfs/CMakeLists.txt
View File

@ -35,7 +35,6 @@ qt_add_module(EglFSDeviceIntegration
#### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:<TRUE>:
# MODULE = "eglfsdeviceintegration"
# _LOADED = "qt_module"
## Scopes:
#####################################################################
@ -100,7 +99,6 @@ qt_add_plugin(qeglfs
#### Keys ignored in scope 11:.:.:eglfs-plugin.pro:<TRUE>:
# OTHER_FILES = "$$PWD/eglfs.json"
# _LOADED = "qt_plugin"
## Scopes:
#####################################################################

30
src/plugins/platforms/xcb/.prev_CMakeLists.txt
View File

@ -4,7 +4,7 @@
## XcbQpa Module:
#####################################################################
add_qt_module(XcbQpa
qt_add_module(XcbQpa
INTERNAL_MODULE
NO_MODULE_HEADERS
SOURCES
@ -71,20 +71,17 @@ add_qt_module(XcbQpa
XKB::XKB
)
#### Keys ignored in scope 2:.:.:xcb_qpa_lib.pro:<TRUE>:
# _LOADED = "qt_build_paths" "qt_module"
## Scopes:
#####################################################################
extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
qt_extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate
LIBRARIES
Qt::LinuxAccessibilitySupportPrivate
PUBLIC_LIBRARIES
Qt::LinuxAccessibilitySupport
)
extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
SOURCES
qxcbvulkaninstance.cpp qxcbvulkaninstance.h
qxcbvulkanwindow.cpp qxcbvulkanwindow.h
@ -94,39 +91,39 @@ extend_target(XcbQpa CONDITION QT_FEATURE_vulkan
Qt::VulkanSupport
)
extend_target(XcbQpa CONDITION QT_FEATURE_glib
qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib
LIBRARIES
GLIB2::GLIB2
)
extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
qt_extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop
SOURCES
qxcbdrag.cpp qxcbdrag.h
)
extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_xlib
PUBLIC_LIBRARIES
X11::XCB
)
extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_sm
SOURCES
qxcbsessionmanager.cpp qxcbsessionmanager.h
PUBLIC_LIBRARIES
${X11_SM_LIB} ${X11_ICE_LIB}
)
extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
qt_extend_target(XcbQpa CONDITION QT_FEATURE_dlopen
PUBLIC_LIBRARIES
${CMAKE_DL_LIBS}
)
extend_target(XcbQpa CONDITION CLANG AND NOT ICC
qt_extend_target(XcbQpa CONDITION CLANG AND NOT ICC
COMPILE_OPTIONS
-ftemplate-depth=1024
)
extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
SOURCES
nativepainting/qbackingstore_x11.cpp nativepainting/qbackingstore_x11_p.h
nativepainting/qcolormap_x11.cpp nativepainting/qcolormap_x11_p.h
@ -139,12 +136,12 @@ extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting
nativepainting
)
extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
qt_extend_target(XcbQpa CONDITION QT_FEATURE_xcb_native_painting AND QT_FEATURE_xrender
PUBLIC_LIBRARIES
PkgConfig::XRender
)
extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
qt_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_painting
LIBRARIES
WrapFreetype::WrapFreetype
)
@ -152,7 +149,7 @@ extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_xcb_native_p
## qxcb Plugin:
#####################################################################
add_qt_plugin(qxcb
qt_add_plugin(qxcb
TYPE platforms
CLASS_NAME QXcbIntegrationPlugin
SOURCES
@ -171,7 +168,6 @@ add_qt_plugin(qxcb
#### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>:
# OTHER_FILES = "xcb.json" "README"
# _LOADED = "qt_plugin"
## Scopes:
#####################################################################

4
src/plugins/platforms/xcb/CMakeLists.txt
View File

@ -94,9 +94,6 @@ qt_add_module(XcbQpa
XKB::XKB
)
#### Keys ignored in scope 2:.:.:xcb_qpa_lib.pro:<TRUE>:
# _LOADED = "qt_build_paths" "qt_module"
## Scopes:
#####################################################################
@ -211,7 +208,6 @@ qt_add_plugin(qxcb
#### Keys ignored in scope 19:.:.:xcb-plugin.pro:<TRUE>:
# OTHER_FILES = "xcb.json" "README"
# _LOADED = "qt_plugin"
## Scopes:
#####################################################################

4
src/tools/bootstrap/.prev_CMakeLists.txt
View File

@ -53,9 +53,10 @@ qt_add_module(Bootstrap
../../corelib/kernel/qsystemsemaphore.cpp
../../corelib/kernel/qvariant.cpp
../../corelib/plugin/quuid.cpp
../../corelib/serialization/qcborvalue.cpp
../../corelib/serialization/qdatastream.cpp
../../corelib/serialization/qjson.cpp
../../corelib/serialization/qjsonarray.cpp
../../corelib/serialization/qjsoncbor.cpp
../../corelib/serialization/qjsondocument.cpp
../../corelib/serialization/qjsonobject.cpp
../../corelib/serialization/qjsonparser.cpp
@ -87,7 +88,6 @@ qt_add_module(Bootstrap
../../corelib/tools/qcryptographichash.cpp
../../corelib/tools/qhash.cpp
../../corelib/tools/qline.cpp
../../corelib/tools/qlist.cpp
../../corelib/tools/qmap.cpp
../../corelib/tools/qpoint.cpp
../../corelib/tools/qrect.cpp

4
src/tools/bootstrap/CMakeLists.txt
View File

@ -51,9 +51,10 @@ qt_extend_target(Bootstrap
../../corelib/kernel/qsystemsemaphore.cpp
../../corelib/kernel/qvariant.cpp
../../corelib/plugin/quuid.cpp
../../corelib/serialization/qcborvalue.cpp
../../corelib/serialization/qdatastream.cpp
../../corelib/serialization/qjson.cpp
../../corelib/serialization/qjsonarray.cpp
../../corelib/serialization/qjsoncbor.cpp
../../corelib/serialization/qjsondocument.cpp
../../corelib/serialization/qjsonobject.cpp
../../corelib/serialization/qjsonparser.cpp
@ -85,7 +86,6 @@ qt_extend_target(Bootstrap
../../corelib/tools/qcryptographichash.cpp
../../corelib/tools/qhash.cpp
../../corelib/tools/qline.cpp
../../corelib/tools/qlist.cpp
../../corelib/tools/qmap.cpp
../../corelib/tools/qpoint.cpp
../../corelib/tools/qrect.cpp

16
src/widgets/.prev_CMakeLists.txt
View File

@ -9,8 +9,6 @@ qt_add_module(Widgets
PLUGIN_TYPES styles
SOURCES
itemviews/qfileiconprovider.cpp itemviews/qfileiconprovider.h itemviews/qfileiconprovider_p.h
kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h
kernel/qactiongroup.cpp kernel/qactiongroup.h
kernel/qapplication.cpp kernel/qapplication.h kernel/qapplication_p.h
kernel/qboxlayout.cpp kernel/qboxlayout.h
kernel/qdesktopwidget.cpp kernel/qdesktopwidget.h kernel/qdesktopwidget_p.h
@ -21,14 +19,12 @@ qt_add_module(Widgets
kernel/qlayout.cpp kernel/qlayout.h kernel/qlayout_p.h
kernel/qlayoutengine.cpp kernel/qlayoutengine_p.h
kernel/qlayoutitem.cpp kernel/qlayoutitem.h
kernel/qshortcut.cpp kernel/qshortcut.h
kernel/qsizepolicy.cpp kernel/qsizepolicy.h
kernel/qstackedlayout.cpp kernel/qstackedlayout.h
kernel/qstandardgestures.cpp kernel/qstandardgestures_p.h
kernel/qtestsupport_widgets.cpp kernel/qtestsupport_widgets.h
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/qwidgetrepaintmanager.cpp kernel/qwidgetrepaintmanager_p.h
kernel/qwidgetsvariant.cpp
kernel/qwidgetwindow.cpp kernel/qwidgetwindow_p.h
@ -321,6 +317,13 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
effects/qpixmapfilter.cpp effects/qpixmapfilter_p.h
)
qt_extend_target(Widgets CONDITION QT_FEATURE_action
SOURCES
kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h
kernel/qactiongroup.cpp kernel/qactiongroup.h
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
@ -331,6 +334,11 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout
kernel/qformlayout.cpp kernel/qformlayout.h
)
qt_extend_target(Widgets CONDITION QT_FEATURE_shortcut
SOURCES
kernel/qshortcut.cpp kernel/qshortcut.h
)
qt_extend_target(Widgets CONDITION QT_FEATURE_tooltip
SOURCES
kernel/qtooltip.cpp kernel/qtooltip.h

16
src/widgets/CMakeLists.txt
View File

@ -9,8 +9,6 @@ qt_add_module(Widgets
PLUGIN_TYPES styles
SOURCES
itemviews/qfileiconprovider.cpp itemviews/qfileiconprovider.h itemviews/qfileiconprovider_p.h
kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h
kernel/qactiongroup.cpp kernel/qactiongroup.h
kernel/qapplication.cpp kernel/qapplication.h kernel/qapplication_p.h
kernel/qboxlayout.cpp kernel/qboxlayout.h
kernel/qdesktopwidget.cpp kernel/qdesktopwidget.h kernel/qdesktopwidget_p.h
@ -21,14 +19,12 @@ qt_add_module(Widgets
kernel/qlayout.cpp kernel/qlayout.h kernel/qlayout_p.h
kernel/qlayoutengine.cpp kernel/qlayoutengine_p.h
kernel/qlayoutitem.cpp kernel/qlayoutitem.h
kernel/qshortcut.cpp kernel/qshortcut.h
kernel/qsizepolicy.cpp kernel/qsizepolicy.h
kernel/qstackedlayout.cpp kernel/qstackedlayout.h
kernel/qstandardgestures.cpp kernel/qstandardgestures_p.h
kernel/qtestsupport_widgets.cpp kernel/qtestsupport_widgets.h
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/qwidgetrepaintmanager.cpp kernel/qwidgetrepaintmanager_p.h
kernel/qwidgetsvariant.cpp
kernel/qwidgetwindow.cpp kernel/qwidgetwindow_p.h
@ -323,6 +319,13 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_graphicseffect
effects/qpixmapfilter.cpp effects/qpixmapfilter_p.h
)
qt_extend_target(Widgets CONDITION QT_FEATURE_action
SOURCES
kernel/qaction.cpp kernel/qaction.h kernel/qaction_p.h
kernel/qactiongroup.cpp kernel/qactiongroup.h
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
@ -333,6 +336,11 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_formlayout
kernel/qformlayout.cpp kernel/qformlayout.h
)
qt_extend_target(Widgets CONDITION QT_FEATURE_shortcut
SOURCES
kernel/qshortcut.cpp kernel/qshortcut.h
)
qt_extend_target(Widgets CONDITION QT_FEATURE_tooltip
SOURCES
kernel/qtooltip.cpp kernel/qtooltip.h

3
src/xml/CMakeLists.txt
View File

@ -6,7 +6,8 @@
qt_add_module(Xml
SOURCES
dom/qdom.cpp dom/qdom.h
dom/qdom.cpp dom/qdom.h dom/qdom_p.h
dom/qdomhelpers.cpp dom/qdomhelpers_p.h
qtxmlglobal.h
sax/qxml.cpp sax/qxml.h sax/qxml_p.h
DEFINES

1
tests/auto/concurrent/qtconcurrentfilter/.prev_CMakeLists.txt
View File

@ -9,7 +9,6 @@ add_qt_test(tst_qtconcurrentfilter
tst_qtconcurrentfilter.cpp
DEFINES
-QT_NO_LINKED_LIST
QT_STRICT_ITERATORS
PUBLIC_LIBRARIES
Qt::Concurrent
)

1
tests/auto/concurrent/qtconcurrentmap/.prev_CMakeLists.txt
View File

@ -9,7 +9,6 @@ add_qt_test(tst_qtconcurrentmap
tst_qtconcurrentmap.cpp
DEFINES
-QT_NO_LINKED_LIST
QT_STRICT_ITERATORS
PUBLIC_LIBRARIES
Qt::Concurrent
)

2
tests/auto/concurrent/qtconcurrentmedian/CMakeLists.txt
View File

@ -7,8 +7,6 @@
add_qt_test(tst_qtconcurrentmedian
SOURCES
tst_qtconcurrentmedian.cpp
DEFINES
QT_STRICT_ITERATORS
PUBLIC_LIBRARIES
Qt::Concurrent
)

1
tests/auto/corelib/io/qfile/.prev_CMakeLists.txt
View File

@ -18,7 +18,6 @@ list(APPEND test_data "forRenaming.txt")
list(APPEND test_data "resources/file1.ext1")
add_qt_test(tst_qfile
GUI
SOURCES
../../../../shared/emulationdetector.h
tst_qfile.cpp

1
tests/auto/corelib/io/qfile/CMakeLists.txt
View File

@ -18,7 +18,6 @@ list(APPEND test_data "forRenaming.txt")
list(APPEND test_data "resources/file1.ext1")
add_qt_test(tst_qfile
GUI
SOURCES
../../../../shared/emulationdetector.h
tst_qfile.cpp

1
tests/auto/corelib/io/qlockfile/CMakeLists.txt
View File

@ -5,7 +5,6 @@
#####################################################################
add_qt_test(tst_qlockfile
GUI
SOURCES
tst_qlockfile.cpp
LIBRARIES

4
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-cache/.prev_CMakeLists.txt
View File

@ -17,7 +17,7 @@ add_qt_test(tst_qmimedatabase-cache
)
# Resources:
set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
set_source_files_properties("/devel/qt5/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
)
set(mimetypes_resource_files
@ -28,7 +28,7 @@ add_qt_resource(tst_qmimedatabase-cache "mimetypes"
PREFIX
"/qt-project.org/qmime/packages"
BASE
"/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
"/devel/qt5/qtbase/src/corelib/mimetypes"
FILES
${mimetypes_resource_files}
)

4
tests/auto/corelib/mimetypes/qmimedatabase/qmimedatabase-xml/.prev_CMakeLists.txt
View File

@ -17,7 +17,7 @@ add_qt_test(tst_qmimedatabase-xml
)
# Resources:
set_source_files_properties("/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
set_source_files_properties("/devel/qt5/qtbase/src/corelib/mimetypes/mime/packages/freedesktop.org.xml"
PROPERTIES QT_RESOURCE_ALIAS "freedesktop.org.xml"
)
set(mimetypes_resource_files
@ -28,7 +28,7 @@ add_qt_resource(tst_qmimedatabase-xml "mimetypes"
PREFIX
"/qt-project.org/qmime/packages"
BASE
"/Volumes/T3/Dev/qt/qt5_cmake/qtbase/src/corelib/mimetypes"
"/devel/qt5/qtbase/src/corelib/mimetypes"
FILES
${mimetypes_resource_files}
)

1
tests/auto/corelib/thread/qfuture/.prev_CMakeLists.txt
View File

@ -9,7 +9,6 @@ add_qt_test(tst_qfuture
tst_qfuture.cpp
DEFINES
-QT_NO_JAVA_STYLE_ITERATORS
QT_STRICT_ITERATORS
LIBRARIES
Qt::CorePrivate
)

2
tests/auto/corelib/thread/qresultstore/CMakeLists.txt
View File

@ -7,8 +7,6 @@
add_qt_test(tst_qresultstore
SOURCES
tst_qresultstore.cpp
DEFINES
QT_STRICT_ITERATORS
LIBRARIES
Qt::CorePrivate
)

15
tests/auto/corelib/thread/qthreadstorage/crashonexit/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,15 @@
# Generated from crashonexit.pro.
#####################################################################
## crashonexit Binary:
#####################################################################
add_qt_executable(crashonexit
OUTPUT_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit"
INSTALL_DIRECTORY "${INSTALL_TESTSDIR}/tst_qthreadstorage/crashonexit"
SOURCES
crashOnExit.cpp
)
## Scopes:
#####################################################################

2
tests/auto/corelib/tools/CMakeLists.txt
View File

@ -18,7 +18,7 @@ add_subdirectory(qhash)
add_subdirectory(qhashfunctions)
# add_subdirectory(qline) # special case not ported
add_subdirectory(qlinkedlist)
add_subdirectory(qlist)
# add_subdirectory(qlist) # special case no longer exists
# add_subdirectory(qlist_strictiterators) # special case not ported
add_subdirectory(qmakearray)
add_subdirectory(qmap)

12
tests/auto/corelib/tools/qcommandlineparser/CMakeLists.txt
View File

@ -1,3 +1,11 @@
add_subdirectory(testhelper)
# Generated from qcommandlineparser.pro.
add_qt_test(tst_qcommandlineparser SOURCES tst_qcommandlineparser.cpp)
#####################################################################
## tst_qcommandlineparser Test:
#####################################################################
add_qt_test(tst_qcommandlineparser
SOURCES
tst_qcommandlineparser.cpp
)
add_subdirectory(testhelper)

13
tests/auto/corelib/tools/qlist/CMakeLists.txt
View File

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

2
tests/auto/dbus/qdbusabstractadaptor/CMakeLists.txt
View File

@ -1,3 +1,4 @@
# Generated from qdbusabstractadaptor.pro.
add_subdirectory(qmyserver)
@ -10,3 +11,4 @@ add_qt_test(tst_qdbusabstractadaptor
Qt::CorePrivate
Qt::DBus
)

10
tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt Normal file
View File

@ -0,0 +1,10 @@
# Generated from qdbusabstractinterface.pro.
#####################################################################
## tst_qdbusabstractinterface Test:
#####################################################################
# special case begin
# this test can not be generated here. It needs to be set up in the
# parent directory
# special case end

1
tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
View File

@ -8,6 +8,7 @@ add_qt_test(tst_qabstractitemview
SOURCES
tst_qabstractitemview.cpp
LIBRARIES
Qt::GuiPrivate
Qt::TestPrivate
PUBLIC_LIBRARIES
Qt::Gui

2
tests/auto/widgets/widgets/qabstractbutton/CMakeLists.txt
View File

@ -7,6 +7,8 @@
add_qt_test(tst_qabstractbutton
SOURCES
tst_qabstractbutton.cpp
LIBRARIES
Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
Qt::Widgets

3
tests/benchmarks/corelib/io/qdiriterator/CMakeLists.txt
View File

@ -11,3 +11,6 @@ add_qt_benchmark(tst_bench_qdiriterator
PUBLIC_LIBRARIES
Qt::Test
)
## Scopes:
#####################################################################

17
tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,17 @@
# Generated from qtimer_vs_qmetaobject.pro.
#####################################################################
## qtimer_vs_qmetaobject Binary:
#####################################################################
add_qt_benchmark(qtimer_vs_qmetaobject
SOURCES
tst_qtimer_vs_qmetaobject.cpp
INCLUDE_DIRECTORIES
.
PUBLIC_LIBRARIES
Qt::Test
)
#### Keys ignored in scope 1:.:.:qtimer_vs_qmetaobject.pro:<TRUE>:
# TEMPLATE = "app"

1
tests/manual/cocoa/menus/CMakeLists.txt
View File

@ -5,7 +5,6 @@
#####################################################################
add_qt_manual_test(menus
GUI
SOURCES
main.cpp
PUBLIC_LIBRARIES

1
tests/manual/cocoa/popups/CMakeLists.txt
View File

@ -5,7 +5,6 @@
#####################################################################
add_qt_manual_test(popups
GUI
SOURCES
main.cpp
PUBLIC_LIBRARIES

1
tests/manual/embeddedintoforeignwindow/CMakeLists.txt
View File

@ -17,6 +17,7 @@ add_qt_manual_test(embeddedintoforeignwindow
INCLUDE_DIRECTORIES
../diaglib
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui

3
tests/manual/foreignwindows/CMakeLists.txt
View File

@ -15,6 +15,9 @@ add_qt_manual_test(foreignwindows
QT_DIAG_LIB
INCLUDE_DIRECTORIES
../diaglib
LIBRARIES
Qt::CorePrivate
Qt::GuiPrivate
PUBLIC_LIBRARIES
Qt::Gui
Qt::Widgets

1
tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt
View File

@ -5,7 +5,6 @@
#####################################################################
add_qt_manual_test(qcursorhighdpi
GUI
SOURCES
main.cpp
LIBRARIES

18
tests/manual/qnetconmonitor/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,18 @@
# Generated from qnetconmonitor.pro.
#####################################################################
## qnetconmonitor Binary:
#####################################################################
add_qt_manual_test(qnetconmonitor
SOURCES
tst_qnetconmonitor.cpp
LIBRARIES
Qt::NetworkPrivate
PUBLIC_LIBRARIES
Qt::Network
Qt::Test
)
#### Keys ignored in scope 1:.:.:qnetconmonitor.pro:<TRUE>:
# TEMPLATE = "app"

19
tests/manual/qnetworkreply/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,19 @@
# Generated from qnetworkreply.pro.
#####################################################################
## tst_manual_qnetworkreply Binary:
#####################################################################
add_qt_manual_test(tst_manual_qnetworkreply
SOURCES
main.cpp
LIBRARIES
Qt::CorePrivate
Qt::NetworkPrivate
PUBLIC_LIBRARIES
Qt::Network
Qt::Test
)
#### Keys ignored in scope 1:.:.:qnetworkreply.pro:<TRUE>:
# TEMPLATE = "app"

19
tests/manual/socketengine/.prev_CMakeLists.txt Normal file
View File

@ -0,0 +1,19 @@
# Generated from socketengine.pro.
#####################################################################
## tst_socketengine Binary:
#####################################################################
add_qt_manual_test(tst_socketengine
SOURCES
main.cpp
LIBRARIES
Qt::CorePrivate
Qt::NetworkPrivate
PUBLIC_LIBRARIES
Qt::Network
Qt::Test
)
#### Keys ignored in scope 1:.:.:socketengine.pro:<TRUE>:
# TEMPLATE = "app"

1
tests/manual/textrendering/nativetext/CMakeLists.txt
View File

@ -5,7 +5,6 @@
#####################################################################
add_qt_manual_test(nativetext
GUI
SOURCES
main.cpp
LIBRARIES

1
tests/manual/touch/CMakeLists.txt
View File

@ -5,7 +5,6 @@
#####################################################################
add_qt_manual_test(touch
GUI
SOURCES
main.cpp
PUBLIC_LIBRARIES

6
util/cmake/helper.py
View File

@ -356,6 +356,12 @@ _qt_library_map = [
"Qt6",
"Qt::LinuxOfonoSupport",
extra=["COMPONENTS", "LinuxOfonoSupport"],
),
LibraryMapping(
"linuxofono_support_private",
"Qt6",
"Qt::LinuxOfonoSupportPrivate",
extra=["COMPONENTS", "LinuxOfonoSupportPrivate"],
)
# qtzlib: No longer supported.
]

13
util/cmake/pro2cmake.py
View File

@ -1519,10 +1519,15 @@ def map_condition(condition: str) -> str:
condition = re.sub(r"(^| )armeabi-v7a", "TEST_architecture_arch STREQUAL arm", condition)
# some defines replacements
condition = re.sub(r"DEFINES___contains___QT_NO_CURSOR", r"(NOT QT_FEATURE_cursor)", condition)
condition = re.sub(
r"DEFINES___contains___QT_NO_TRANSLATION", r"(NOT QT_FEATURE_translation)", condition
)
condition = re.sub(r"DEFINES___contains___QT_NO_CURSOR",
r"(NOT QT_FEATURE_cursor)",
condition)
condition = re.sub(r"DEFINES___contains___QT_NO_TRANSLATION",
r"(NOT QT_FEATURE_translation)",
condition)
condition = re.sub(r"styles___contains___fusion",
r"QT_FEATURE_style_fusion",
condition)
cmake_condition = ""
for part in condition.split():