diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-07-09 16:07:50 +0200 |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-07-16 12:09:40 +0200 |
| commit | d124bcf70a8e167ebf997ac2a4222623a5a9acdf (patch) | |
| tree | 5c4a548573dbe8efd2486af162421af7fe18bf9a /qmake/Makefile.win32-g++-sh | |
| parent | dbb3062a06c3ea6d3cb5b6536cee7b2e4b99b677 (diff) | |
| download | qt4-tools-d124bcf70a8e167ebf997ac2a4222623a5a9acdf.tar.gz | |
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-g++-sh')
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index 3f1b1df861..08a903847c 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -71,6 +71,8 @@ QTOBJS= \ qmalloc.o \ qmap.o \ qregexp.o \ + qtextcodec.o \ + qutfcodec.o \ qstring.o \ qstringlist.o \ qtextstream.o \ @@ -191,6 +193,9 @@ qvsnprintf.o: $(SOURCE_PATH)/src/corelib/tools/qvsnprintf.cpp qbytearraymatcher.o: $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qbytearraymatcher.cpp +qutfcodec.o: $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/codecs/qutfcodec.cpp + qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qstring.cpp |