diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-17 12:33:40 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2020-06-20 02:04:38 +0200 |
| commit | 18ec53156ee704fdb4977436fccfdc85333e614b (patch) | |
| tree | df734ce7893d570f4a90f923fcfe9c80ddc3de05 /qmake | |
| parent | 4455de24d453138411c57bae55af18f3fba58d4b (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 'qmake')
| -rw-r--r-- | qmake/Makefile.win32 | 3 | ||||
| -rw-r--r-- | qmake/qmake.pro | 1 |
2 files changed, 0 insertions, 4 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index e33bdcdb83..6478c43edd 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -212,9 +212,6 @@ qmake_pch.obj: {$(SOURCE_PATH)\src\3rdparty\md5}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< -{$(SOURCE_PATH)\src\corelib\codecs}.cpp{}.obj:: - $(CXX) $(CXXFLAGS) $< - {$(SOURCE_PATH)\src\corelib\global}.cpp{}.obj:: $(CXX) $(CXXFLAGS) $< diff --git a/qmake/qmake.pro b/qmake/qmake.pro index 10f118724c..ee190a820a 100644 --- a/qmake/qmake.pro +++ b/qmake/qmake.pro @@ -107,7 +107,6 @@ VPATH += \ ../src/corelib/text \ ../src/corelib/tools \ ../src/corelib/kernel \ - ../src/corelib/codecs \ ../src/corelib/plugin \ ../src/corelib/io \ ../src/corelib/time \ |