diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-04 12:37:18 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-04 12:37:18 (GMT) |
| commit | 8f83747d12efc612b730a7dd911f916127387c0c (patch) | |
| tree | d61b4c877cd14247ae0de260034cb99494434c5d /tools/designer/translations | |
| parent | 53038b678ccba374da5ce9ad216044f075a3ffd8 (diff) | |
| parent | 8e98033a67263f6a2d9155f228dc28e2faee4f5e (diff) | |
| download | Qt-8f83747d12efc612b730a7dd911f916127387c0c.zip Qt-8f83747d12efc612b730a7dd911f916127387c0c.tar.gz Qt-8f83747d12efc612b730a7dd911f916127387c0c.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
Diffstat (limited to 'tools/designer/translations')
| -rw-r--r-- | tools/designer/translations/translations.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/designer/translations/translations.pro b/tools/designer/translations/translations.pro index 279b322..103c1fe 100644 --- a/tools/designer/translations/translations.pro +++ b/tools/designer/translations/translations.pro @@ -129,6 +129,7 @@ HEADERS += ../../shared/findwidget/abstractfindwidget.h \ TR_DIR = $$PWD/../../../translations TRANSLATIONS = \ + $$TR_DIR/designer_cs.ts \ $$TR_DIR/designer_de.ts \ $$TR_DIR/designer_fr.ts \ $$TR_DIR/designer_hu.ts \ |