diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-07-09 14:07:50 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-07-16 10:09:40 (GMT) |
| commit | d124bcf70a8e167ebf997ac2a4222623a5a9acdf (patch) | |
| tree | 5c4a548573dbe8efd2486af162421af7fe18bf9a /qmake/Makefile.win32 | |
| parent | dbb3062a06c3ea6d3cb5b6536cee7b2e4b99b677 (diff) | |
| download | Qt-d124bcf70a8e167ebf997ac2a4222623a5a9acdf.zip Qt-d124bcf70a8e167ebf997ac2a4222623a5a9acdf.tar.gz Qt-d124bcf70a8e167ebf997ac2a4222623a5a9acdf.tar.bz2 | |
Changed the implementation of the unicode text codecs to share more code with qstring.
The qstring unicode conversion functions used to have its own
implementation, which did the same as QUtf*Codecs, so with the change
all of them will share the same implementation.
Reviewed-by: Thiago Macieira
Diffstat (limited to 'qmake/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 53130aa..77eb9fc 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -108,6 +108,8 @@ QTOBJS= \ qmalloc.obj \ qmap.obj \ qregexp.obj \ + qtextcodec.obj \ + qutfcodec.obj \ qstring.obj \ qstringlist.obj \ qtextstream.obj \ @@ -194,6 +196,8 @@ clean:: -del qmalloc.obj -del qmap.obj -del qregexp.obj + -del qtextcodec.obj + -del qutfcodec.obj -del qstring.obj -del qstringlist.obj -del qtextstream.obj @@ -337,6 +341,9 @@ qbytearraymatcher.obj: $(SOURCE_PATH)\src\corelib\tools\qbytearraymatcher.cpp qchar.obj: $(SOURCE_PATH)\src\corelib\tools\qchar.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qchar.cpp +qutfcodec.obj: $(SOURCE_PATH)\src\corelib\codecs\qutfcodec.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\codecs\qutfcodec.cpp + qstring.obj: $(SOURCE_PATH)\src\corelib\tools\qstring.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)\src\corelib\tools\qstring.cpp |