diff options
| author | axis <qt-info@nokia.com> | 2010-02-18 15:31:01 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-18 15:31:01 +0100 |
| commit | d24f440ed547f8e9a3737670e41bb645a9159501 (patch) | |
| tree | 14e9ac83c6d688e5480403a152e3ad2e60566ea8 /translations | |
| parent | b477d02479d9effbdb97e189a60dbf44dda5cbc9 (diff) | |
| parent | 505dc33a4060b6fb2a80f3a3ab2a6702ec0b5f3b (diff) | |
| download | qt4-tools-d24f440ed547f8e9a3737670e41bb645a9159501.tar.gz | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-with-qt-master
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/Makefile.unix
qmake/generators/makefile.cpp
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/translations.pri | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/translations/translations.pri b/translations/translations.pri index 808dc4ff0f..a8fb7ee51e 100644 --- a/translations/translations.pri +++ b/translations/translations.pri @@ -25,6 +25,7 @@ ts-qt.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \ 3rdparty/webkit \ activeqt \ corelib \ + declarative \ gui \ multimedia \ network \ |