diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-24 10:37:54 +0100 |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-24 10:37:54 +0100 |
| commit | f1a7f339109ee72059aa135381defeaf6f564977 (patch) | |
| tree | 6a5e8e28849c025efc58096bd57eb1ece7382fc6 /qmake/Makefile.win32-g++-sh | |
| parent | cea4ae150bef0f24b0e8385d47b06a9f6b8197c3 (diff) | |
| parent | 52dc52dffb80f3ffd321156639564b524263810a (diff) | |
| download | qt4-tools-f1a7f339109ee72059aa135381defeaf6f564977.tar.gz | |
Merge remote branch 'earth-team/master-i18n' into 4.8-earth
Conflicts:
src/corelib/tools/tools.pri
Diffstat (limited to 'qmake/Makefile.win32-g++-sh')
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index c3537e39f7..53103b26c3 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -75,6 +75,8 @@ QTOBJS= \ qlist.o \ qlinkedlist.o \ qlocale.o \ + qlocale_tools.o \ + qlocale_win.o \ qmalloc.o \ qmap.o \ qregexp.o \ @@ -175,6 +177,12 @@ qstring.o: $(SOURCE_PATH)/src/corelib/tools/qstring.cpp qlocale.o: $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale.cpp +qlocale_tools.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale_tools.cpp + +qlocale_win.o: $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp + $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/tools/qlocale_win.cpp + quuid.o: $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp $(CXX) $(CXXFLAGS) $(SOURCE_PATH)/src/corelib/plugin/quuid.cpp |