diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-24 09:37:54 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2011-03-24 09:37:54 (GMT) |
| commit | f1a7f339109ee72059aa135381defeaf6f564977 (patch) | |
| tree | 6a5e8e28849c025efc58096bd57eb1ece7382fc6 /src/tools | |
| parent | cea4ae150bef0f24b0e8385d47b06a9f6b8197c3 (diff) | |
| parent | 52dc52dffb80f3ffd321156639564b524263810a (diff) | |
| download | Qt-f1a7f339109ee72059aa135381defeaf6f564977.zip Qt-f1a7f339109ee72059aa135381defeaf6f564977.tar.gz Qt-f1a7f339109ee72059aa135381defeaf6f564977.tar.bz2 | |
Merge remote branch 'earth-team/master-i18n' into 4.8-earth
Conflicts:
src/corelib/tools/tools.pri
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 9e5845c..50ae2cf 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -77,6 +77,7 @@ SOURCES += \ ../../corelib/tools/qhash.cpp \ ../../corelib/tools/qlist.cpp \ ../../corelib/tools/qlocale.cpp \ + ../../corelib/tools/qlocale_tools.cpp \ ../../corelib/tools/qmap.cpp \ ../../corelib/tools/qregexp.cpp \ ../../corelib/tools/qstring.cpp \ @@ -97,6 +98,11 @@ win32:SOURCES += ../../corelib/io/qfilesystemengine_win.cpp \ ../../corelib/io/qfsfileengine_win.cpp \ ../../corelib/plugin/qsystemlibrary.cpp \ +mac: OBJECTIVE_SOURCES += ../../corelib/tools/qlocale_mac.mm +else:symbian:SOURCES += ../../corelib/tools/qlocale_symbian.cpp +else:unix:SOURCES += ../../corelib/tools/qlocale_unix.cpp +else:win32:SOURCES += ../../corelib/tools/qlocale_win.cpp + macx: { QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.4 #enables weak linking for 10.4 (exported) SOURCES += ../../corelib/io/qfilesystemengine_mac.cpp |