summaryrefslogtreecommitdiffstats
path: root/translations
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-04 16:11:28 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-04 16:11:28 (GMT)
commitb59fb6e41ffe971c4f33a2595e10db2f8ecc9c15 (patch)
treefe7de2f1485338756e6cbb1837b0a5b519af179f /translations
parent049447d37d27c461c34d7ff52be2054ecd3208e3 (diff)
parentcc26af5ad405a76b59fc21a34862ce83744a0374 (diff)
downloadQt-b59fb6e41ffe971c4f33a2595e10db2f8ecc9c15.zip
Qt-b59fb6e41ffe971c4f33a2595e10db2f8ecc9c15.tar.gz
Qt-b59fb6e41ffe971c4f33a2595e10db2f8ecc9c15.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QmlViewer: Translate UI Fix insert and scroll to bottom case QDeclarativeDebug: Fix test case QDeclarativeDebug: Handle case where client with ongoing queries is deleted Remove compile warning Fix QUnifiedTimer bug Stop the animation driver when there are no more animations. Optimization and benchmark for setting object properties from QML. Add Constant and Final flags to QMetaObjectBuilder Fixed QML TextEdit docs Make -no-opengl exist on other platforms Only ask for name when the user goes on the high score list.
Diffstat (limited to 'translations')
-rw-r--r--translations/translations.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/translations/translations.pro b/translations/translations.pro
index 311b032..dc99beb 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