summaryrefslogtreecommitdiffstats
path: root/src/corelib/.prev_CMakeLists.txt
diff options
context:
space:
mode:
authorKarsten Heimrich <karsten.heimrich@qt.io>2020-06-17 12:33:40 +0200
committerKarsten Heimrich <karsten.heimrich@qt.io>2020-06-20 02:04:38 +0200
commit18ec53156ee704fdb4977436fccfdc85333e614b (patch)
treedf734ce7893d570f4a90f923fcfe9c80ddc3de05 /src/corelib/.prev_CMakeLists.txt
parent4455de24d453138411c57bae55af18f3fba58d4b (diff)
Move QTextCodec support out of QtCore
* Assume UTF-8 on all Unix like systems * Export some functions to be able to compile QTextCodec once moved to Qt5Compat. Task-number: QTBUG-75665 Change-Id: I52ec47a848bc0ba72e9c7689668b1bcc5d736c29 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/.prev_CMakeLists.txt')
-rw-r--r--src/corelib/.prev_CMakeLists.txt61
1 files changed, 10 insertions, 51 deletions
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index 59e670e5db..f93c934c85 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -9,8 +9,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
@@ -157,6 +155,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
@@ -565,6 +564,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_future
thread/qfutureinterface.cpp thread/qfutureinterface.h thread/qfutureinterface_p.h
thread/qfuturesynchronizer.h
thread/qfuturewatcher.cpp thread/qfuturewatcher.h thread/qfuturewatcher_p.h
+ thread/qpromise.h
thread/qresultstore.cpp thread/qresultstore.h
)
@@ -983,47 +983,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
@@ -1058,7 +1017,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"
@@ -1067,7 +1026,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_mimetype AND QT_FEATURE_mimetype_data
.rcc
)
-#### 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"
@@ -1075,23 +1034,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 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"
qt_extend_target(Core CONDITION WASM