diff options
author | David Boddie <david.boddie@nokia.com> | 2011-05-13 17:55:50 +0200 |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2011-05-13 17:55:50 +0200 |
commit | 4adf280fb6bda8e519bf23606b841e040cb04fab (patch) | |
tree | 88eda2f4f5cf46c9e68fa4aea7ca832aaa6c65db /translations | |
parent | d9ef2f580bd78e658064e4fa3d0acf73b9c2a921 (diff) | |
parent | f32438ffccd8728143b93399e7cd251e72d23b55 (diff) |
Merge branch '4.8'
Conflicts:
doc/src/declarative/whatsnew.qdoc
doc/src/examples/orientation.qdoc
doc/src/examples/webftpclient.qdoc
examples/declarative/ui-components/main/qml/pics/niagara_falls.jpg
src/corelib/global/qglobal.cpp
src/gui/text/qglyphs.cpp
src/gui/text/qplatformfontdatabase_qpa.cpp
Diffstat (limited to 'translations')
-rw-r--r-- | translations/translations.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/translations/translations.pro b/translations/translations.pro index 311b032557..dc99bebf57 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -55,6 +55,7 @@ addTsTargets(assistant, ../tools/assistant/tools/tools.pro) addTsTargets(qt_help, ../tools/assistant/lib/lib.pro) addTsTargets(qtconfig, ../tools/qtconfig/qtconfig.pro) addTsTargets(qvfb, ../tools/qvfb/qvfb.pro) +addTsTargets(qmlviewer, ../tools/qml/qml.pro) check-ts.commands = (cd $$PWD && perl check-ts.pl) check-ts.depends = ts-all |