diff options
Diffstat (limited to 'src/corelib/.prev_CMakeLists.txt')
| -rw-r--r-- | src/corelib/.prev_CMakeLists.txt | 51 |
1 files changed, 19 insertions, 32 deletions
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 |