From a3bd80c08cd046d892c666098093ec20fc9e1321 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 21 Sep 2020 19:30:19 +0200 Subject: CMake: Regenerate projects Clean up the state of the projects, before changing the internal CMake API function names. Task-number: QTBUG-86815 Change-Id: I90f1b21b8ae4439a4a293872c3bb728dab44a50d Reviewed-by: Joerg Bornemann --- src/corelib/.prev_CMakeLists.txt | 51 ++++++++-------------- src/corelib/CMakeLists.txt | 35 +++++++-------- src/network/.prev_CMakeLists.txt | 7 ++- src/network/CMakeLists.txt | 7 ++- src/plugins/imageformats/jpeg/.prev_CMakeLists.txt | 5 +++ src/plugins/imageformats/jpeg/CMakeLists.txt | 5 +++ .../eglfs_kms_egldevice/.prev_CMakeLists.txt | 32 ++++++++++++++ .../eglfs_kms_support/.prev_CMakeLists.txt | 28 ++++++++++++ src/plugins/platforms/xcb/.prev_CMakeLists.txt | 1 - src/plugins/platforms/xcb/CMakeLists.txt | 1 + src/tools/bootstrap/.prev_CMakeLists.txt | 3 -- src/tools/moc/.prev_CMakeLists.txt | 8 ++++ src/tools/moc/CMakeLists.txt | 8 ++++ src/widgets/.prev_CMakeLists.txt | 8 ---- 14 files changed, 131 insertions(+), 68 deletions(-) create mode 100644 src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt create mode 100644 src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt (limited to 'src') diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt index 3b820c9f3f..e024f49c93 100644 --- a/src/corelib/.prev_CMakeLists.txt +++ b/src/corelib/.prev_CMakeLists.txt @@ -50,6 +50,7 @@ qt_add_module(Core io/qfsfileengine.cpp io/qfsfileengine_p.h io/qfsfileengine_iterator.cpp io/qfsfileengine_iterator_p.h io/qiodevice.cpp io/qiodevice.h io/qiodevice_p.h + io/qiodevicebase.h io/qipaddress.cpp io/qipaddress_p.h io/qlockfile.cpp io/qlockfile.h io/qlockfile_p.h io/qloggingcategory.cpp io/qloggingcategory.h @@ -87,7 +88,6 @@ qt_add_module(Core kernel/qmetaobject_moc_p.h kernel/qmetaobjectbuilder.cpp kernel/qmetaobjectbuilder_p.h kernel/qmetatype.cpp kernel/qmetatype.h kernel/qmetatype_p.h - kernel/qmetatypeswitcher_p.h kernel/qmimedata.cpp kernel/qmimedata.h kernel/qobject.cpp kernel/qobject.h kernel/qobject_p.h kernel/qobject_impl.h @@ -132,6 +132,7 @@ qt_add_module(Core serialization/qxmlstreamgrammar.cpp serialization/qxmlstreamgrammar_p.h serialization/qxmlstreamparser_p.h serialization/qxmlutils.cpp serialization/qxmlutils_p.h + text/qanystringview.h text/qbytearray.cpp text/qbytearray.h text/qbytearray_p.h text/qbytearrayalgorithms.h text/qbytearraylist.cpp text/qbytearraylist.h @@ -145,7 +146,6 @@ qt_add_module(Core text/qlocale_data_p.h text/qlocale_tools.cpp text/qlocale_tools_p.h text/qstring.cpp text/qstring.h - text/qstring_compat.cpp text/qstringalgorithms.h text/qstringalgorithms_p.h text/qstringbuilder.cpp text/qstringbuilder.h text/qstringconverter.cpp text/qstringconverter.h text/qstringconverter_p.h @@ -158,6 +158,7 @@ qt_add_module(Core text/qtextboundaryfinder.cpp text/qtextboundaryfinder.h text/qunicodetables_p.h text/qunicodetools.cpp text/qunicodetools_p.h + text/qutf8stringview.h text/qvsnprintf.cpp thread/qmutex.h thread/qreadwritelock.h @@ -191,9 +192,9 @@ qt_add_module(Core tools/qhashfunctions.h tools/qiterator.h tools/qline.cpp tools/qline.h - tools/qlist.cpp tools/qlist.h + tools/qlist.h tools/qmakearray_p.h - tools/qmap.cpp tools/qmap.h + tools/qmap.h tools/qmargins.cpp tools/qmargins.h tools/qmessageauthenticationcode.cpp tools/qmessageauthenticationcode.h tools/qoffsetstringarray_p.h @@ -229,8 +230,6 @@ qt_add_module(Core ../3rdparty/tinycbor/src PRECOMPILED_HEADER "global/qt_pch.h" - NO_PCH_SOURCES - "text/qstring_compat.cpp" ) @@ -379,6 +378,7 @@ qt_extend_target(Core CONDITION APPLE kernel/qcore_foundation.mm kernel/qcore_mac.mm kernel/qcore_mac_p.h kernel/qcoreapplication_mac.cpp + kernel/qelapsedtimer_mac.cpp kernel/qeventdispatcher_cf.mm kernel/qeventdispatcher_cf_p.h LIBRARIES ${FWCoreFoundation} @@ -578,13 +578,6 @@ qt_extend_target(Core CONDITION ICC strict ) -qt_extend_target(Core CONDITION MSVC - SOURCES - tools/qvector_msvc.cpp - NO_PCH_SOURCES - "tools/qvector_msvc.cpp" -) - qt_extend_target(Core CONDITION QT_FEATURE_system_zlib LIBRARIES ZLIB::ZLIB @@ -658,7 +651,6 @@ qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXW qt_extend_target(Core CONDITION APPLE AND NOT NACL SOURCES - kernel/qelapsedtimer_mac.cpp text/qlocale_mac.mm ) @@ -850,6 +842,11 @@ qt_extend_target(Core CONDITION APPLE AND NOT MACOS ${FWMobileCoreServices} ) +qt_extend_target(Core CONDITION UNIX AND NOT APPLE + SOURCES + kernel/qelapsedtimer_unix.cpp +) + qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED SOURCES io/qstandardpaths_android.cpp @@ -935,16 +932,6 @@ qt_extend_target(Core CONDITION WATCHOS ${FWWatchKit} ) -qt_extend_target(Core CONDITION NACL - SOURCES - kernel/qfunctions_nacl.cpp kernel/qfunctions_nacl.h -) - -qt_extend_target(Core CONDITION INTEGRITY OR (NACL AND UNIX) OR (UNIX AND NOT APPLE) - SOURCES - kernel/qelapsedtimer_unix.cpp -) - qt_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX SOURCES kernel/qpoll.cpp @@ -1008,7 +995,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h ) -#### Keys ignored in scope 181:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype: +#### Keys ignored in scope 172:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype: # MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml" # OTHER_FILES = "$$MIME_DATABASE" @@ -1017,7 +1004,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_data .rcc ) -#### Keys ignored in scope 182:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database: +#### Keys ignored in scope 173:.: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" @@ -1025,23 +1012,23 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_data # mimedb.output = "$$outpath/qmimeprovider_database.cpp" # mimedb.variable_out = "INCLUDED_SOURCES" -#### Keys ignored in scope 183:.:mimetypes:mimetypes/mimetypes.pri:ANDROID: +#### Keys ignored in scope 174:.:mimetypes:mimetypes/mimetypes.pri:ANDROID: # outpath = "$$outpath/$${QT_ARCH}" -#### Keys ignored in scope 185:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): +#### Keys ignored in scope 176:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): # outpath = "$$outpath/debug" -#### Keys ignored in scope 186:.:mimetypes:mimetypes/mimetypes.pri:else: +#### Keys ignored in scope 177:.:mimetypes:mimetypes/mimetypes.pri:else: # outpath = "$$outpath/release" -#### Keys ignored in scope 187:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY: +#### Keys ignored in scope 178:.: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 188:.:mimetypes:mimetypes/mimetypes.pri:else: +#### Keys ignored in scope 179:.:mimetypes:mimetypes/mimetypes.pri:else: # mimedb.commands = "perl" "$${mimedb.depends}" -#### Keys ignored in scope 189:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd: +#### Keys ignored in scope 180:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd: # mimedb.commands = "--zstd" qt_extend_target(Core CONDITION WASM diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 32aa0f91b0..7a9256daf8 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -71,8 +71,8 @@ qt_add_module(Core io/qfilesystemmetadata_p.h io/qfsfileengine.cpp io/qfsfileengine_p.h io/qfsfileengine_iterator.cpp io/qfsfileengine_iterator_p.h - io/qiodevicebase.h io/qiodevice.cpp io/qiodevice.h io/qiodevice_p.h + io/qiodevicebase.h io/qipaddress.cpp io/qipaddress_p.h io/qlockfile.cpp io/qlockfile.h io/qlockfile_p.h io/qloggingcategory.cpp io/qloggingcategory.h @@ -502,6 +502,7 @@ qt_extend_target(Core CONDITION APPLE kernel/qcore_foundation.mm kernel/qcore_mac.mm kernel/qcore_mac_p.h kernel/qcoreapplication_mac.cpp + kernel/qelapsedtimer_mac.cpp kernel/qeventdispatcher_cf.mm kernel/qeventdispatcher_cf_p.h LIBRARIES ${FWCoreFoundation} @@ -767,7 +768,6 @@ qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXW qt_extend_target(Core CONDITION APPLE AND NOT NACL SOURCES - kernel/qelapsedtimer_mac.cpp text/qlocale_mac.mm ) @@ -959,6 +959,11 @@ qt_extend_target(Core CONDITION APPLE AND NOT MACOS ${FWMobileCoreServices} ) +qt_extend_target(Core CONDITION UNIX AND NOT APPLE + SOURCES + kernel/qelapsedtimer_unix.cpp +) + qt_extend_target(Core CONDITION ANDROID AND NOT ANDROID_EMBEDDED SOURCES io/qstandardpaths_android.cpp @@ -1044,16 +1049,6 @@ qt_extend_target(Core CONDITION WATCHOS ${FWWatchKit} ) -qt_extend_target(Core CONDITION NACL - SOURCES - kernel/qfunctions_nacl.cpp kernel/qfunctions_nacl.h -) - -qt_extend_target(Core CONDITION INTEGRITY OR (NACL AND UNIX) OR (UNIX AND NOT APPLE) - SOURCES - kernel/qelapsedtimer_unix.cpp -) - qt_extend_target(Core CONDITION QT_FEATURE_poll_select AND UNIX SOURCES kernel/qpoll.cpp @@ -1117,7 +1112,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h ) -#### Keys ignored in scope 181:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype: +#### Keys ignored in scope 172:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype: # MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml" # OTHER_FILES = "$$MIME_DATABASE" @@ -1128,7 +1123,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype #) # special case end -#### Keys ignored in scope 182:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database: +#### Keys ignored in scope 173:.: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" @@ -1136,23 +1131,23 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype # mimedb.output = "$$outpath/qmimeprovider_database.cpp" # mimedb.variable_out = "INCLUDED_SOURCES" -#### Keys ignored in scope 183:.:mimetypes:mimetypes/mimetypes.pri:ANDROID: +#### Keys ignored in scope 174:.:mimetypes:mimetypes/mimetypes.pri:ANDROID: # outpath = "$$outpath/$${QT_ARCH}" -#### Keys ignored in scope 185:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): +#### Keys ignored in scope 176:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): # outpath = "$$outpath/debug" -#### Keys ignored in scope 186:.:mimetypes:mimetypes/mimetypes.pri:else: +#### Keys ignored in scope 177:.:mimetypes:mimetypes/mimetypes.pri:else: # outpath = "$$outpath/release" -#### Keys ignored in scope 187:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY: +#### Keys ignored in scope 178:.: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 188:.:mimetypes:mimetypes/mimetypes.pri:else: +#### Keys ignored in scope 179:.:mimetypes:mimetypes/mimetypes.pri:else: # mimedb.commands = "perl" "$${mimedb.depends}" -#### Keys ignored in scope 189:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd: +#### Keys ignored in scope 180:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd: # mimedb.commands = "--zstd" # Resources: # special case begin diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt index ee82f114f1..623ea27e26 100644 --- a/src/network/.prev_CMakeLists.txt +++ b/src/network/.prev_CMakeLists.txt @@ -45,6 +45,7 @@ qt_add_module(Network ssl/qssl.cpp ssl/qssl.h ssl/qssl_p.h ssl/qsslcertificate.cpp ssl/qsslcertificate.h ssl/qsslcertificate_p.h ssl/qsslcertificateextension.cpp ssl/qsslcertificateextension.h ssl/qsslcertificateextension_p.h + ssl/qtls_utils_p.h DEFINES QT_NO_FOREACH QT_NO_USING_NAMESPACE @@ -89,12 +90,13 @@ qt_extend_target(Network CONDITION APPLE qt_extend_target(Network CONDITION WASM SOURCES + access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h + access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h ) qt_extend_target(Network CONDITION QT_FEATURE_http SOURCES - access/qdecompresshelper.cpp access/qdecompresshelper_p.h access/http2/bitstreams.cpp access/http2/bitstreams_p.h access/http2/hpack.cpp access/http2/hpack_p.h access/http2/hpacktable.cpp access/http2/hpacktable_p.h @@ -103,6 +105,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_http access/http2/http2streams.cpp access/http2/http2streams_p.h access/http2/huffman.cpp access/http2/huffman_p.h access/qabstractprotocolhandler.cpp access/qabstractprotocolhandler_p.h + access/qdecompresshelper.cpp access/qdecompresshelper_p.h access/qhttp2configuration.cpp access/qhttp2configuration.h access/qhttp2protocolhandler.cpp access/qhttp2protocolhandler_p.h access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h @@ -389,7 +392,7 @@ qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE ssl/qsslsocket_openssl_android.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR singleAndroidAbi) +qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi) LIBRARIES crypto_${CMAKE_SYSTEM_PROCESSOR} ssl_${CMAKE_SYSTEM_PROCESSOR} diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 1782922ebe..d19457e0e0 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -45,6 +45,7 @@ qt_add_module(Network ssl/qssl.cpp ssl/qssl.h ssl/qssl_p.h ssl/qtls_utils_p.h ssl/qsslcertificate.cpp ssl/qsslcertificate.h ssl/qsslcertificate_p.h ssl/qsslcertificateextension.cpp ssl/qsslcertificateextension.h ssl/qsslcertificateextension_p.h + ssl/qtls_utils_p.h DEFINES QT_NO_FOREACH QT_NO_USING_NAMESPACE @@ -89,12 +90,13 @@ qt_extend_target(Network CONDITION APPLE qt_extend_target(Network CONDITION WASM SOURCES + access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h + access/qhttpnetworkheader.cpp access/qhttpnetworkheader_p.h access/qnetworkreplywasmimpl.cpp access/qnetworkreplywasmimpl_p.h ) qt_extend_target(Network CONDITION QT_FEATURE_http SOURCES - access/qdecompresshelper.cpp access/qdecompresshelper_p.h access/http2/bitstreams.cpp access/http2/bitstreams_p.h access/http2/hpack.cpp access/http2/hpack_p.h access/http2/hpacktable.cpp access/http2/hpacktable_p.h @@ -103,6 +105,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_http access/http2/http2streams.cpp access/http2/http2streams_p.h access/http2/huffman.cpp access/http2/huffman_p.h access/qabstractprotocolhandler.cpp access/qabstractprotocolhandler_p.h + access/qdecompresshelper.cpp access/qdecompresshelper_p.h access/qhttp2configuration.cpp access/qhttp2configuration.h access/qhttp2protocolhandler.cpp access/qhttp2protocolhandler_p.h access/qhttpmultipart.cpp access/qhttpmultipart.h access/qhttpmultipart_p.h @@ -389,7 +392,7 @@ qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE ssl/qsslsocket_openssl_android.cpp ) -qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR singleAndroidAbi) +qt_extend_target(Network CONDITION ANDROID AND QT_FEATURE_openssl AND QT_FEATURE_openssl_linked AND QT_FEATURE_ssl AND (build_pass OR single_android_abi) LIBRARIES crypto_${CMAKE_SYSTEM_PROCESSOR} ssl_${CMAKE_SYSTEM_PROCESSOR} diff --git a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt index b7e0c7cab7..95b3aceff5 100644 --- a/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/.prev_CMakeLists.txt @@ -87,3 +87,8 @@ qt_extend_target(QJpegPlugin CONDITION NOT QT_FEATURE_system_jpeg #### Keys ignored in scope 5:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC: # QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main" + +qt_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg + DEFINES + _CRT_SECURE_NO_WARNINGS +) diff --git a/src/plugins/imageformats/jpeg/CMakeLists.txt b/src/plugins/imageformats/jpeg/CMakeLists.txt index 16584bdb7d..52c3aa6911 100644 --- a/src/plugins/imageformats/jpeg/CMakeLists.txt +++ b/src/plugins/imageformats/jpeg/CMakeLists.txt @@ -97,3 +97,8 @@ endif() #### Keys ignored in scope 5:.:../../../3rdparty:../../../3rdparty/libjpeg.pri:GCC: # QMAKE_CFLAGS_WARN_ON = "-Wno-unused-parameter" "-Wno-main" + +qt_extend_target(QJpegPlugin CONDITION MSVC AND NOT QT_FEATURE_system_jpeg + DEFINES + _CRT_SECURE_NO_WARNINGS +) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt new file mode 100644 index 0000000000..6f1d5f6751 --- /dev/null +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt @@ -0,0 +1,32 @@ +# Generated from eglfs_kms_egldevice.pro. + +##################################################################### +## QEglFSKmsEglDeviceIntegrationPlugin Plugin: +##################################################################### + +qt_internal_add_plugin(QEglFSKmsEglDeviceIntegrationPlugin + OUTPUT_NAME qeglfs-kms-egldevice-integration + TYPE egldeviceintegrations + SOURCES + qeglfskmsegldevice.cpp qeglfskmsegldevice.h + qeglfskmsegldeviceintegration.cpp qeglfskmsegldeviceintegration.h + qeglfskmsegldevicemain.cpp + qeglfskmsegldevicescreen.cpp qeglfskmsegldevicescreen.h + DEFINES + QT_EGL_NO_X11 + INCLUDE_DIRECTORIES + ../../api + ../eglfs_kms_support + PUBLIC_LIBRARIES + Libdrm::Libdrm + Qt::Core + Qt::CorePrivate + Qt::EglFSDeviceIntegrationPrivate + Qt::EglFsKmsSupportPrivate + Qt::Gui + Qt::GuiPrivate + Qt::KmsSupportPrivate +) + +#### Keys ignored in scope 1:.:.:eglfs_kms_egldevice.pro:: +# OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt new file mode 100644 index 0000000000..ec11b355af --- /dev/null +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt @@ -0,0 +1,28 @@ +# Generated from eglfs_kms_support.pro. + +##################################################################### +## EglFsKmsSupport Module: +##################################################################### + +qt_add_module(EglFsKmsSupport + INTERNAL_MODULE + NO_MODULE_HEADERS + SOURCES + qeglfskmsdevice.cpp qeglfskmsdevice.h + qeglfskmseventreader.cpp qeglfskmseventreader.h + qeglfskmshelpers.h + qeglfskmsintegration.cpp qeglfskmsintegration.h + qeglfskmsscreen.cpp qeglfskmsscreen.h + DEFINES + QT_EGL_NO_X11 + INCLUDE_DIRECTORIES + ../../api + PUBLIC_LIBRARIES + Libdrm::Libdrm + Qt::Core + Qt::CorePrivate + Qt::EglFSDeviceIntegrationPrivate + Qt::Gui + Qt::GuiPrivate + Qt::KmsSupportPrivate +) diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt index 0cf401037e..67802a85ae 100644 --- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt +++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt @@ -53,7 +53,6 @@ qt_add_module(XcbQpa XCB::SYNC XCB::XCB XCB::XFIXES - XCB::XINERAMA XCB::XINPUT XCB::XKB XKB::XKB diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 9b04785dcb..182ec53d8b 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -53,6 +53,7 @@ qt_add_module(XcbQpa XCB::SYNC XCB::XCB XCB::XFIXES + # XCB::XINPUT # special case remove handled below XCB::XKB XKB::XKB ) diff --git a/src/tools/bootstrap/.prev_CMakeLists.txt b/src/tools/bootstrap/.prev_CMakeLists.txt index d66ef7a6a1..b42582efd8 100644 --- a/src/tools/bootstrap/.prev_CMakeLists.txt +++ b/src/tools/bootstrap/.prev_CMakeLists.txt @@ -105,7 +105,6 @@ qt_add_module(Bootstrap ../../corelib/text/qlocale_tools.cpp ../../corelib/text/qregularexpression.cpp ../../corelib/text/qstring.cpp - ../../corelib/text/qstring_compat.cpp ../../corelib/text/qstringbuilder.cpp ../../corelib/text/qstringconverter.cpp ../../corelib/text/qstringlist.cpp @@ -121,14 +120,12 @@ qt_add_module(Bootstrap ../../corelib/tools/qcryptographichash.cpp ../../corelib/tools/qhash.cpp ../../corelib/tools/qline.cpp - ../../corelib/tools/qmap.cpp ../../corelib/tools/qpoint.cpp ../../corelib/tools/qrect.cpp ../../corelib/tools/qringbuffer.cpp ../../corelib/tools/qsize.cpp ../../corelib/tools/qversionnumber.cpp ../../xml/dom/qdom.cpp - ../../xml/sax/qxml.cpp DEFINES HAVE_CONFIG_H PCRE2_CODE_UNIT_WIDTH=16 diff --git a/src/tools/moc/.prev_CMakeLists.txt b/src/tools/moc/.prev_CMakeLists.txt index e6004cefca..f3688020f6 100644 --- a/src/tools/moc/.prev_CMakeLists.txt +++ b/src/tools/moc/.prev_CMakeLists.txt @@ -35,3 +35,11 @@ qt_add_tool(${target_name} #### Keys ignored in scope 1:.:.:moc.pro:: # QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler" # _OPTION = "host_build" + +## Scopes: +##################################################################### + +qt_extend_target(${target_name} CONDITION MSVC + DEFINES + _CRT_SECURE_NO_WARNINGS +) diff --git a/src/tools/moc/CMakeLists.txt b/src/tools/moc/CMakeLists.txt index 0073acf319..91c9d89cea 100644 --- a/src/tools/moc/CMakeLists.txt +++ b/src/tools/moc/CMakeLists.txt @@ -36,3 +36,11 @@ qt_add_tool(${target_name} #### Keys ignored in scope 1:.:.:moc.pro:: # QMAKE_TARGET_DESCRIPTION = "Qt Meta Object Compiler" # _OPTION = "host_build" + +## Scopes: +##################################################################### + +qt_extend_target(${target_name} CONDITION MSVC + DEFINES + _CRT_SECURE_NO_WARNINGS +) diff --git a/src/widgets/.prev_CMakeLists.txt b/src/widgets/.prev_CMakeLists.txt index b0c3af801a..277ad0b469 100644 --- a/src/widgets/.prev_CMakeLists.txt +++ b/src/widgets/.prev_CMakeLists.txt @@ -300,8 +300,6 @@ qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i3 qt_extend_target(Widgets CONDITION MACOS SOURCES kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h - widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm - widgets/qmacnativewidget_mac.h widgets/qmacnativewidget_mac.mm LIBRARIES ${FWAppKit} z @@ -622,12 +620,6 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_filedialog uic ) -qt_extend_target(Widgets CONDITION QT_FEATURE_filesystemmodel - SOURCES - dialogs/qfileinfogatherer.cpp dialogs/qfileinfogatherer_p.h - dialogs/qfilesystemmodel.cpp dialogs/qfilesystemmodel.h dialogs/qfilesystemmodel_p.h -) - qt_extend_target(Widgets CONDITION QT_FEATURE_fontdialog SOURCES dialogs/qfontdialog.cpp dialogs/qfontdialog.h dialogs/qfontdialog_p.h -- cgit v1.2.3