diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-10 19:41:50 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-10 19:41:50 +1000 |
| commit | dbe2cf64abca0eb6e0846e2e080943a2a3cd4718 (patch) | |
| tree | cda88858d83827682d125f06d06161c4b271c390 | |
| parent | 1b2ef359deb6f2ef8fc0dca3ed18ed4733b44822 (diff) | |
| parent | 1e88b8f8479e8fff7e34457d56d78cc17461e212 (diff) | |
| download | qttranslations-dbe2cf64abca0eb6e0846e2e080943a2a3cd4718.tar.gz | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qttranslations-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qttranslations-staging:
QmlViewer: Translate UI
Added .tag file with Git revision.
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | .tag | 1 | ||||
| -rw-r--r-- | translations/translations.pro | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a3c6108 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.tag ident @@ -0,0 +1 @@ +$Id$ diff --git a/translations/translations.pro b/translations/translations.pro index cc42b60..37b8e0f 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 |