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 | |
| parent | cea4ae150bef0f24b0e8385d47b06a9f6b8197c3 (diff) | |
| parent | 52dc52dffb80f3ffd321156639564b524263810a (diff) | |
Merge remote branch 'earth-team/master-i18n' into 4.8-earth
Conflicts:
src/corelib/tools/tools.pri
Diffstat (limited to 'qmake/Makefile.win32')
| -rw-r--r-- | qmake/Makefile.win32 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32 index 0ab2932cfb..6fd393993e 100644 --- a/qmake/Makefile.win32 +++ b/qmake/Makefile.win32 @@ -98,6 +98,8 @@ QTOBJS= \ qlist.obj \ qlinkedlist.obj \ qlocale.obj \ + qlocale_tools.obj \ + qlocale_win.obj \ qmalloc.obj \ qmap.obj \ qregexp.obj \ |