diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-21 19:30:19 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-09-22 19:08:53 +0200 |
| commit | a3bd80c08cd046d892c666098093ec20fc9e1321 (patch) | |
| tree | 5016362fcda4c093c8cb3274adf4c6d6a7d22719 | |
| parent | 9959090da84ee8681126da5763365e3e2a746f7e (diff) | |
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 <joerg.bornemann@qt.io>
46 files changed, 492 insertions, 92 deletions
diff --git a/examples/widgets/.prev_CMakeLists.txt b/examples/widgets/.prev_CMakeLists.txt index ea87c3c027..cffc0a6293 100644 --- a/examples/widgets/.prev_CMakeLists.txt +++ b/examples/widgets/.prev_CMakeLists.txt @@ -30,6 +30,3 @@ endif() if(QT_FEATURE_opengl AND TARGET Qt::Gui) add_subdirectory(windowcontainer) endif() -if(APPLE) - add_subdirectory(mac) -endif() diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 8284e9a1ad..aa265d4308 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -99,8 +99,8 @@ qt_add_tool(${target_name} ../src/corelib/tools/qbitarray.cpp ../src/corelib/tools/qbitarray.h ../src/corelib/tools/qcryptographichash.cpp ../src/corelib/tools/qcryptographichash.h ../src/corelib/tools/qhash.cpp ../src/corelib/tools/qhash.h - ../src/corelib/tools/qlist.cpp ../src/corelib/tools/qlist.h - ../src/corelib/tools/qmap.cpp ../src/corelib/tools/qmap.h + ../src/corelib/tools/qlist.h + ../src/corelib/tools/qmap.h ../src/corelib/tools/qvector.h ../src/corelib/tools/qversionnumber.cpp ../src/corelib/tools/qversionnumber.h cachekeys.h diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 863ac746c6..2f3eb78b79 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -115,9 +115,9 @@ qt_add_tool(${target_name} ../src/corelib/time/qdatetime.cpp ../src/corelib/time/qdatetime.h ../src/corelib/time/qdatetime_p.h # special case ../src/corelib/tools/qhash.cpp ../src/corelib/tools/qhash.h ../src/corelib/tools/qlist.h + ../src/corelib/tools/qmap.h ../src/corelib/text/qlocale.cpp ../src/corelib/text/qlocale.h ../src/corelib/text/qlocale_tools.cpp ../src/corelib/text/qlocale_tools_p.h - ../src/corelib/tools/qmap.h ../src/corelib/text/qregularexpression.cpp ../src/corelib/text/qregularexpression.h ../src/corelib/tools/qringbuffer.cpp # special case ../src/corelib/text/qstring.cpp ../src/corelib/text/qstring.h 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:<TRUE>: +# 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:<TRUE>: # 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:<TRUE>: # 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 diff --git a/tests/auto/.prev_CMakeLists.txt b/tests/auto/.prev_CMakeLists.txt index 8a5e002e84..b0539214c8 100644 --- a/tests/auto/.prev_CMakeLists.txt +++ b/tests/auto/.prev_CMakeLists.txt @@ -14,7 +14,7 @@ endif() if(TARGET Qt::Concurrent) add_subdirectory(concurrent) endif() -if((((TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt) AND (system("dbus-send --session --type=signal / local.AutotestCheck.Hello >_ss_QMAKE_SYSTEM_NULL_DEVICE 2>&1"))))) +if((((system("dbus-send --session --type=signal / local.AutotestCheck.Hello >_ss_QMAKE_SYSTEM_NULL_DEVICE 2>&1")) AND (TARGET Qt::DBus AND NOT CMAKE_CROSSCOMPILING AND NOT boot2qt)))) add_subdirectory(dbus) endif() if(TARGET Qt::Network) diff --git a/tests/auto/corelib/global/CMakeLists.txt b/tests/auto/corelib/global/CMakeLists.txt index 4dab15eaab..2aa86c533e 100644 --- a/tests/auto/corelib/global/CMakeLists.txt +++ b/tests/auto/corelib/global/CMakeLists.txt @@ -6,12 +6,12 @@ add_subdirectory(qgetputenv) add_subdirectory(qglobal) add_subdirectory(qnumeric) add_subdirectory(qfloat16) +add_subdirectory(qkeycombination) add_subdirectory(qrandomgenerator) add_subdirectory(qlogging) add_subdirectory(qtendian) add_subdirectory(qglobalstatic) add_subdirectory(qhooks) -add_subdirectory(qkeycombination) if(WIN32) add_subdirectory(qwinregistry) endif() diff --git a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt index be03b3e986..74ec2cd855 100644 --- a/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt +++ b/tests/auto/corelib/io/qstandardpaths/CMakeLists.txt @@ -10,10 +10,7 @@ list(APPEND test_data "qstandardpaths.pro") qt_add_test(tst_qstandardpaths SOURCES - ../../../../shared/emulationdetector.h tst_qstandardpaths.cpp - INCLUDE_DIRECTORIES - ../../../../shared TESTDATA ${test_data} ) diff --git a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt index bdf2e2f461..9534e22368 100644 --- a/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## tst_qvariant Test: ##################################################################### -add_qt_test(tst_qvariant +qt_add_test(tst_qvariant SOURCES tst_qvariant.cpp DEFINES @@ -13,6 +13,7 @@ add_qt_test(tst_qvariant ../../../other/qvariant_common PUBLIC_LIBRARIES Qt::CorePrivate + Qt::Gui ) # Resources: @@ -21,7 +22,7 @@ set(qvariant_resource_files "stream/qt5.0/" ) -add_qt_resource(tst_qvariant "qvariant" +qt_add_resource(tst_qvariant "qvariant" PREFIX "/" FILES @@ -32,7 +33,12 @@ add_qt_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### -extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion +qt_extend_target(tst_qvariant CONDITION MSVC + COMPILE_OPTIONS + /bigobj +) + +qt_extend_target(tst_qvariant CONDITION NOT QT_FEATURE_doubleconversion AND NOT QT_FEATURE_system_doubleconversion DEFINES QT_NO_DOUBLECONVERSION ) diff --git a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt index 7ac25bf3d5..9534e22368 100644 --- a/tests/auto/corelib/kernel/qvariant/CMakeLists.txt +++ b/tests/auto/corelib/kernel/qvariant/CMakeLists.txt @@ -33,7 +33,7 @@ qt_add_resource(tst_qvariant "qvariant" ## Scopes: ##################################################################### -qt_extend_target(tst_qmetatype CONDITION MSVC +qt_extend_target(tst_qvariant CONDITION MSVC COMPILE_OPTIONS /bigobj ) diff --git a/tests/auto/corelib/serialization/json/CMakeLists.txt b/tests/auto/corelib/serialization/json/CMakeLists.txt index 57cab16b3d..f2d0d9d54c 100644 --- a/tests/auto/corelib/serialization/json/CMakeLists.txt +++ b/tests/auto/corelib/serialization/json/CMakeLists.txt @@ -15,13 +15,12 @@ qt_add_test(tst_json ##################################################################### #### Keys ignored in scope 2:.:.:json.pro:NOT ANDROID: -# TESTDATA = "bom.json" "test.json" "test.bjson" "test3.json" "test2.json" +# TESTDATA = "bom.json" "test.json" "test3.json" "test2.json" if(ANDROID) # Resources: set(json_resource_files "bom.json" - "test.bjson" "test.json" "test2.json" "test3.json" diff --git a/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro index f6d259e817..6deac78485 100644 --- a/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro +++ b/tests/auto/gui/kernel/qmouseevent/qmouseevent.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qmouseevent -QT += testlib gui_private +QT += testlib gui-private SOURCES += tst_qmouseevent.cpp diff --git a/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt b/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt new file mode 100644 index 0000000000..3196ccca59 --- /dev/null +++ b/tests/auto/network/access/qabstractnetworkcache/.prev_CMakeLists.txt @@ -0,0 +1,22 @@ +# Generated from qabstractnetworkcache.pro. + +##################################################################### +## tst_qabstractnetworkcache Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + tests/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_qabstractnetworkcache + SOURCES + tst_qabstractnetworkcache.cpp + PUBLIC_LIBRARIES + Qt::Network + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qabstractnetworkcache.pro:<TRUE>: +# QT_TEST_SERVER_LIST = "apache2" diff --git a/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt b/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt index e8680993cb..ce8f55646c 100644 --- a/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt +++ b/tests/auto/network/access/qdecompresshelper/.prev_CMakeLists.txt @@ -9,6 +9,7 @@ qt_add_test(tst_qdecompresshelper gzip.rcc.cpp inflate.rcc.cpp tst_qdecompresshelper.cpp + zstandard.rcc.cpp DEFINES SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}" PUBLIC_LIBRARIES diff --git a/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt b/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt new file mode 100644 index 0000000000..621e339c1a --- /dev/null +++ b/tests/auto/network/access/qhttpnetworkconnection/.prev_CMakeLists.txt @@ -0,0 +1,21 @@ +# Generated from qhttpnetworkconnection.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qhttpnetworkconnection Test: +##################################################################### + +qt_add_test(tst_qhttpnetworkconnection + SOURCES + tst_qhttpnetworkconnection.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate +) + +#### Keys ignored in scope 1:.:.:qhttpnetworkconnection.pro:<TRUE>: +# QT_TEST_SERVER_LIST = "apache2" +# _REQUIREMENTS = "qtConfig(private_tests)" diff --git a/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt b/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt new file mode 100644 index 0000000000..8afcdc3376 --- /dev/null +++ b/tests/auto/network/socket/qhttpsocketengine/.prev_CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from qhttpsocketengine.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qhttpsocketengine Test: +##################################################################### + +qt_add_test(tst_qhttpsocketengine + SOURCES + tst_qhttpsocketengine.cpp + INCLUDE_DIRECTORIES + ${QT_SOURCE_TREE}/src/network + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate +) + +#### Keys ignored in scope 1:.:.:qhttpsocketengine.pro:<TRUE>: +# MOC_DIR = "tmp" +# _REQUIREMENTS = "qtConfig(private_tests)" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qhttpsocketengine.pro:LINUX: +# QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" + +qt_extend_target(tst_qhttpsocketengine CONDITION WIN32 + PUBLIC_LIBRARIES + ws2_32 +) diff --git a/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt b/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt new file mode 100644 index 0000000000..0b2430c81a --- /dev/null +++ b/tests/auto/network/socket/qsocks5socketengine/.prev_CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from qsocks5socketengine.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qsocks5socketengine Test: +##################################################################### + +qt_add_test(tst_qsocks5socketengine + SOURCES + tst_qsocks5socketengine.cpp + INCLUDE_DIRECTORIES + ${QT_SOURCE_TREE}/src/network + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate +) + +#### Keys ignored in scope 1:.:.:qsocks5socketengine.pro:<TRUE>: +# MOC_DIR = "tmp" +# _REQUIREMENTS = "qtConfig(private_tests)" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 2:.:.:qsocks5socketengine.pro:LINUX: +# QT_TEST_SERVER_LIST = "danted" "apache2" "cyrus" + +qt_extend_target(tst_qsocks5socketengine CONDITION WIN32 + PUBLIC_LIBRARIES + ws2_32 +) diff --git a/tests/auto/network/ssl/qsslsocket/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslsocket/.prev_CMakeLists.txt new file mode 100644 index 0000000000..59ab6ff93a --- /dev/null +++ b/tests/auto/network/ssl/qsslsocket/.prev_CMakeLists.txt @@ -0,0 +1,38 @@ +# Generated from qsslsocket.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qsslsocket Test: +##################################################################### + +# Collect test data +list(APPEND test_data "certs") + +qt_add_test(tst_qsslsocket + SOURCES + tst_qsslsocket.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate + TESTDATA ${test_data} +) + +#### Keys ignored in scope 1:.:.:qsslsocket.pro:<TRUE>: +# _REQUIREMENTS = "qtConfig(private_tests)" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 3:.:.:qsslsocket.pro:(CMAKE_BUILD_TYPE STREQUAL Debug): +# DESTDIR = "debug" + +#### Keys ignored in scope 4:.:.:qsslsocket.pro:else: +# DESTDIR = "release" + +#### Keys ignored in scope 5:.:.:qsslsocket.pro:LINUX: +# QT_TEST_SERVER_LIST = "squid" "danted" "cyrus" "apache2" "echo" diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/.prev_CMakeLists.txt new file mode 100644 index 0000000000..9a1beaeb76 --- /dev/null +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/.prev_CMakeLists.txt @@ -0,0 +1,35 @@ +# Generated from qsslsocket_onDemandCertificates_member.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qsslsocket_onDemandCertificates_member Test: +##################################################################### + +qt_add_test(tst_qsslsocket_onDemandCertificates_member + SOURCES + tst_qsslsocket_onDemandCertificates_member.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate +) + +#### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_member.pro:<TRUE>: +# _REQUIREMENTS = "qtConfig(private_tests)" +# testcase.timeout = "300" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 3:.:.:qsslsocket_onDemandCertificates_member.pro:(CMAKE_BUILD_TYPE STREQUAL Debug): +# DESTDIR = "debug" + +#### Keys ignored in scope 4:.:.:qsslsocket_onDemandCertificates_member.pro:else: +# DESTDIR = "release" + +#### Keys ignored in scope 5:.:.:qsslsocket_onDemandCertificates_member.pro:LINUX: +# QT_TEST_SERVER_LIST = "squid" "danted" diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/.prev_CMakeLists.txt b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/.prev_CMakeLists.txt new file mode 100644 index 0000000000..f8d6735c20 --- /dev/null +++ b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_static/.prev_CMakeLists.txt @@ -0,0 +1,34 @@ +# Generated from qsslsocket_onDemandCertificates_static.pro. + +if(NOT QT_FEATURE_private_tests) + return() +endif() + +##################################################################### +## tst_qsslsocket_onDemandCertificates_static Test: +##################################################################### + +qt_add_test(tst_qsslsocket_onDemandCertificates_static + SOURCES + tst_qsslsocket_onDemandCertificates_static.cpp + DEFINES + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::NetworkPrivate +) + +#### Keys ignored in scope 1:.:.:qsslsocket_onDemandCertificates_static.pro:<TRUE>: +# _REQUIREMENTS = "qtConfig(private_tests)" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 3:.:.:qsslsocket_onDemandCertificates_static.pro:(CMAKE_BUILD_TYPE STREQUAL Debug): +# DESTDIR = "debug" + +#### Keys ignored in scope 4:.:.:qsslsocket_onDemandCertificates_static.pro:else: +# DESTDIR = "release" + +#### Keys ignored in scope 5:.:.:qsslsocket_onDemandCertificates_static.pro:LINUX: +# QT_TEST_SERVER_LIST = "squid" "danted" diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt new file mode 100644 index 0000000000..3208cf2b36 --- /dev/null +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/.prev_CMakeLists.txt @@ -0,0 +1,77 @@ +# Generated from qgraphicsscene.pro. + +##################################################################### +## tst_qgraphicsscene Test: +##################################################################### + +qt_add_test(tst_qgraphicsscene + SOURCES + tst_qgraphicsscene.cpp + DEFINES + QT_NO_CAST_TO_ASCII + SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}\\\" + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::Widgets + Qt::WidgetsPrivate +) + +# Resources: +set(images_resource_files + "Ash_European.jpg" +) + +qt_add_resource(tst_qgraphicsscene "images" + PREFIX + "/" + FILES + ${images_resource_files} +) +set(testdata_resource_files + "testData/render/all-all-45-deg-left.png" + "testData/render/all-all-45-deg-right.png" + "testData/render/all-all-scale-2x.png" + "testData/render/all-all-translate-0-50.png" + "testData/render/all-all-translate-50-0.png" + "testData/render/all-all-untransformed-clip-ellipse.png" + "testData/render/all-all-untransformed-clip-rect.png" + "testData/render/all-all-untransformed.png" + "testData/render/all-bottomleft-untransformed.png" + "testData/render/all-bottomright-untransformed.png" + "testData/render/all-topleft-untransformed.png" + "testData/render/all-topright-untransformed.png" + "testData/render/bottom-bottomright-untransformed.png" + "testData/render/bottom-topleft-untransformed.png" + "testData/render/bottomleft-all-untransformed.png" + "testData/render/bottomleft-topleft-untransformed.png" + "testData/render/bottomright-all-untransformed.png" + "testData/render/bottomright-topleft-untransformed.png" + "testData/render/left-bottomright-untransformed.png" + "testData/render/left-topleft-untransformed.png" + "testData/render/right-bottomright-untransformed.png" + "testData/render/right-topleft-untransformed.png" + "testData/render/top-bottomright-untransformed.png" + "testData/render/top-topleft-untransformed.png" + "testData/render/topleft-all-untransformed.png" + "testData/render/topleft-topleft-untransformed.png" + "testData/render/topright-all-untransformed.png" + "testData/render/topright-topleft-untransformed.png" +) + +qt_add_resource(tst_qgraphicsscene "testdata" + PREFIX + "/" + FILES + ${testdata_resource_files} +) + + +## Scopes: +##################################################################### + +qt_extend_target(tst_qgraphicsscene CONDITION WIN32 + PUBLIC_LIBRARIES + user32 +) diff --git a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt index f0865f6a37..b17d328446 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt +++ b/tests/auto/widgets/graphicsview/qgraphicsscene/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_add_test(tst_qgraphicsscene - LOWDPI + LOWDPI # special case SOURCES tst_qgraphicsscene.cpp DEFINES diff --git a/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt b/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt new file mode 100644 index 0000000000..89f91d1967 --- /dev/null +++ b/tests/auto/widgets/widgets/qframe/.prev_CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qframe.pro. + +##################################################################### +## tst_qframe Test: +##################################################################### + +# Collect test data +file(GLOB_RECURSE test_data_glob + RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + images/*) +list(APPEND test_data ${test_data_glob}) + +qt_add_test(tst_qframe + SOURCES + tst_qframe.cpp + PUBLIC_LIBRARIES + Qt::Gui + Qt::Widgets + TESTDATA ${test_data} +) diff --git a/tests/auto/widgets/widgets/qframe/CMakeLists.txt b/tests/auto/widgets/widgets/qframe/CMakeLists.txt index ac53d07fbd..be08a9b797 100644 --- a/tests/auto/widgets/widgets/qframe/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qframe/CMakeLists.txt @@ -11,7 +11,7 @@ file(GLOB_RECURSE test_data_glob list(APPEND test_data ${test_data_glob}) qt_add_test(tst_qframe - LOWDPI + LOWDPI # special case SOURCES tst_qframe.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt new file mode 100644 index 0000000000..d1af2e811c --- /dev/null +++ b/tests/auto/widgets/widgets/qopenglwidget/.prev_CMakeLists.txt @@ -0,0 +1,18 @@ +# Generated from qopenglwidget.pro. + +##################################################################### +## tst_qopenglwidget Test: +##################################################################### + +qt_add_test(tst_qopenglwidget + SOURCES + tst_qopenglwidget.cpp + PUBLIC_LIBRARIES + Qt::CorePrivate + Qt::Gui + Qt::GuiPrivate + Qt::OpenGL + Qt::OpenGLPrivate + Qt::OpenGLWidgets + Qt::Widgets +) diff --git a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt index 062a468c6c..036f3316d9 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt +++ b/tests/auto/widgets/widgets/qopenglwidget/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### qt_add_test(tst_qopenglwidget - LOWDPI + LOWDPI # special case SOURCES tst_qopenglwidget.cpp PUBLIC_LIBRARIES diff --git a/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt b/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt index cec7aad7b2..6ac77db67d 100644 --- a/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt +++ b/tests/benchmarks/network/access/qdecompresshelper/.prev_CMakeLists.txt @@ -4,7 +4,7 @@ ## qdecompresshelper Binary: ##################################################################### -qt_add_executable(qdecompresshelper +qt_add_benchmark(qdecompresshelper SOURCES main.cpp DEFINES diff --git a/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt b/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt index af7676b561..e8c7493250 100644 --- a/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt +++ b/tests/benchmarks/network/access/qdecompresshelper/CMakeLists.txt @@ -4,7 +4,7 @@ ## qdecompresshelper Binary: ##################################################################### -qt_add_executable(qdecompresshelper +qt_add_benchmark(qdecompresshelper SOURCES main.cpp DEFINES diff --git a/tests/manual/highdpi/dprgadget/CMakeLists.txt b/tests/manual/highdpi/dprgadget/CMakeLists.txt index 1afe59f4a5..0852adbe16 100644 --- a/tests/manual/highdpi/dprgadget/CMakeLists.txt +++ b/tests/manual/highdpi/dprgadget/CMakeLists.txt @@ -1,3 +1,4 @@ +# special case skip regeneration cmake_minimum_required(VERSION 3.14) project(dprgadget LANGUAGES CXX) set(CMAKE_AUTOMOC ON) diff --git a/tests/manual/highdpi/pixelgadget/CMakeLists.txt b/tests/manual/highdpi/pixelgadget/CMakeLists.txt index e463b36441..1bad33bc24 100644 --- a/tests/manual/highdpi/pixelgadget/CMakeLists.txt +++ b/tests/manual/highdpi/pixelgadget/CMakeLists.txt @@ -1,3 +1,4 @@ +# special case skip regeneration cmake_minimum_required(VERSION 3.14) project(pixelgadget LANGUAGES CXX) set(CMAKE_AUTOMOC ON) diff --git a/tests/manual/touch/CMakeLists.txt b/tests/manual/touch/CMakeLists.txt index 571e2bbcec..1545095efa 100644 --- a/tests/manual/touch/CMakeLists.txt +++ b/tests/manual/touch/CMakeLists.txt @@ -9,6 +9,7 @@ qt_add_manual_test(touch main.cpp PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/widgets/kernel/.prev_CMakeLists.txt b/tests/manual/widgets/kernel/.prev_CMakeLists.txt index 0c03aec319..51ee0b63c6 100644 --- a/tests/manual/widgets/kernel/.prev_CMakeLists.txt +++ b/tests/manual/widgets/kernel/.prev_CMakeLists.txt @@ -3,3 +3,4 @@ add_subdirectory(qtooltip) add_subdirectory(sizeonhide) add_subdirectory(layoutreplace) +add_subdirectory(setscreen) diff --git a/tests/manual/widgets/kernel/setscreen/CMakeLists.txt b/tests/manual/widgets/kernel/setscreen/CMakeLists.txt index cf31341d7c..610a748830 100644 --- a/tests/manual/widgets/kernel/setscreen/CMakeLists.txt +++ b/tests/manual/widgets/kernel/setscreen/CMakeLists.txt @@ -9,7 +9,6 @@ qt_add_manual_test(setscreen SOURCES main.cpp PUBLIC_LIBRARIES - Qt::CorePrivate Qt::Gui Qt::Widgets ) diff --git a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt index 4437ce2fa9..1327ea39ef 100644 --- a/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt +++ b/tests/manual/widgets/widgets/defaultUpMenuBar/CMakeLists.txt @@ -9,6 +9,7 @@ qt_add_manual_test(defaultUpMenuBar SOURCES main.cpp PUBLIC_LIBRARIES + Qt::Gui Qt::GuiPrivate Qt::Widgets ) |