diff options
Diffstat (limited to 'src/corelib/CMakeLists.txt')
| -rw-r--r-- | src/corelib/CMakeLists.txt | 60 |
1 files changed, 9 insertions, 51 deletions
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index 27cb30ff03..9d6eb3d908 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -27,8 +27,6 @@ qt_add_module(Core QMAKE_MODULE_CONFIG moc resources EXCEPTIONS SOURCES - codecs/qtextcodec_p.h - codecs/qutfcodec.cpp codecs/qutfcodec_p.h global/archdetect.cpp global/qcompilerdetection.h global/qendian.cpp global/qendian.h global/qendian_p.h @@ -175,6 +173,7 @@ qt_add_module(Core text/qstringlist.cpp text/qstringlist.h text/qstringliteral.h text/qstringmatcher.h + text/qstringtokenizer.cpp text/qstringtokenizer.h text/qstringview.cpp text/qstringview.h text/qtextboundaryfinder.cpp text/qtextboundaryfinder.h text/qunicodetables_p.h @@ -1085,47 +1084,6 @@ qt_extend_target(Core CONDITION QNX AND QT_FEATURE_qqnx_pps PPS::PPS ) -qt_extend_target(Core CONDITION QT_FEATURE_textcodec - SOURCES - codecs/qlatincodec.cpp codecs/qlatincodec_p.h - codecs/qsimplecodec.cpp codecs/qsimplecodec_p.h - codecs/qtextcodec.cpp codecs/qtextcodec.h -) - -qt_extend_target(Core CONDITION QT_FEATURE_codecs AND QT_FEATURE_textcodec - SOURCES - codecs/qisciicodec.cpp codecs/qisciicodec_p.h - codecs/qtsciicodec.cpp codecs/qtsciicodec_p.h -) - -qt_extend_target(Core CONDITION QT_FEATURE_icu AND QT_FEATURE_textcodec - SOURCES - codecs/qicucodec.cpp codecs/qicucodec_p.h -) - -qt_extend_target(Core CONDITION QT_FEATURE_big_codecs AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu - SOURCES - codecs/qbig5codec.cpp codecs/qbig5codec_p.h - codecs/qeucjpcodec.cpp codecs/qeucjpcodec_p.h - codecs/qeuckrcodec.cpp codecs/qeuckrcodec_p.h - codecs/qgb18030codec.cpp codecs/qgb18030codec_p.h - codecs/qjiscodec.cpp codecs/qjiscodec_p.h - codecs/qjpunicode.cpp - codecs/qsjiscodec.cpp codecs/qsjiscodec_p.h -) - -qt_extend_target(Core CONDITION QT_FEATURE_iconv AND QT_FEATURE_textcodec AND NOT QT_FEATURE_icu - SOURCES - codecs/qiconvcodec.cpp codecs/qiconvcodec_p.h - LIBRARIES - iconv -) - -qt_extend_target(Core CONDITION QT_FEATURE_textcodec AND WIN32 AND NOT QT_FEATURE_icu - SOURCES - codecs/qwindowscodec.cpp codecs/qwindowscodec_p.h -) - qt_extend_target(Core CONDITION QT_FEATURE_cborstreamreader SOURCES serialization/qcborstreamreader.cpp serialization/qcborstreamreader.h @@ -1160,7 +1118,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype mimetypes/qmimetypeparser.cpp mimetypes/qmimetypeparser_p.h ) -#### Keys ignored in scope 188:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype: +#### Keys ignored in scope 180:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype: # MIME_DATABASE = "mimetypes/mime/packages/freedesktop.org.xml" # OTHER_FILES = "$$MIME_DATABASE" @@ -1171,7 +1129,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype #) # special case end -#### Keys ignored in scope 189:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_mimetype_database: +#### Keys ignored in scope 181:.: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" @@ -1179,23 +1137,23 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype # mimedb.output = "$$outpath/qmimeprovider_database.cpp" # mimedb.variable_out = "INCLUDED_SOURCES" -#### Keys ignored in scope 190:.:mimetypes:mimetypes/mimetypes.pri:ANDROID: +#### Keys ignored in scope 182:.:mimetypes:mimetypes/mimetypes.pri:ANDROID: # outpath = "$$outpath/$${QT_ARCH}" -#### Keys ignored in scope 192:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): +#### Keys ignored in scope 184:.:mimetypes:mimetypes/mimetypes.pri:(CMAKE_BUILD_TYPE STREQUAL Debug): # outpath = "$$outpath/debug" -#### Keys ignored in scope 193:.:mimetypes:mimetypes/mimetypes.pri:else: +#### Keys ignored in scope 185:.:mimetypes:mimetypes/mimetypes.pri:else: # outpath = "$$outpath/release" -#### Keys ignored in scope 194:.:mimetypes:mimetypes/mimetypes.pri:MAKEFILE_GENERATOR___equals___MSVC.NET OR MAKEFILE_GENERATOR___equals___MSBUILD OR QMAKE_SH_ISEMPTY: +#### Keys ignored in scope 186:.: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 195:.:mimetypes:mimetypes/mimetypes.pri:else: +#### Keys ignored in scope 187:.:mimetypes:mimetypes/mimetypes.pri:else: # mimedb.commands = "perl" "$${mimedb.depends}" -#### Keys ignored in scope 196:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd: +#### Keys ignored in scope 188:.:mimetypes:mimetypes/mimetypes.pri:QT_FEATURE_zstd: # mimedb.commands = "--zstd" # Resources: # special case begin |