diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-29 12:37:15 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-29 12:37:15 (GMT) |
commit | 86b4c125372f02c21be81fff376817852c28afa9 (patch) | |
tree | 65988a37ffaa6c75a72395365aa695c052df2149 /translations/translations.pri | |
parent | 36304a764fb4ee0cc7cc26033c05c8d70c87b4b5 (diff) | |
parent | 82ad1edea9fd6d6955ab9e3f661c625f7ba5ed78 (diff) | |
download | Qt-86b4c125372f02c21be81fff376817852c28afa9.zip Qt-86b4c125372f02c21be81fff376817852c28afa9.tar.gz Qt-86b4c125372f02c21be81fff376817852c28afa9.tar.bz2 |
Merge branch '4.6'
Conflicts:
doc/src/qt4-intro.qdoc
Diffstat (limited to 'translations/translations.pri')
-rw-r--r-- | translations/translations.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/translations/translations.pri b/translations/translations.pri index bd5f093..a0ff2bc 100644 --- a/translations/translations.pri +++ b/translations/translations.pri @@ -30,11 +30,13 @@ ts-qt.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \ activeqt \ corelib \ gui \ + multimedia \ network \ opengl \ plugins \ qt3support \ script \ + scripttools \ sql \ svg \ xml \ |