diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-09-25 10:43:31 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-09-25 10:43:31 (GMT) |
| commit | 06a618df93a4b99118a4718544cd82e4e6c08754 (patch) | |
| tree | 0a261d3d7556150ffb7745be4027242c5494ca82 /tools/designer | |
| parent | bb62bf61c0577a02003a33bf800025cb85e51b54 (diff) | |
| parent | feec449d63c355dd465dea7674d43923e999911e (diff) | |
| download | Qt-06a618df93a4b99118a4718544cd82e4e6c08754.zip Qt-06a618df93a4b99118a4718544cd82e4e6c08754.tar.gz Qt-06a618df93a4b99118a4718544cd82e4e6c08754.tar.bz2 | |
Merge branch 'origin/4.5' into 4.6
Conflicts:
translations/qt_ru.ts
Diffstat (limited to 'tools/designer')
| -rw-r--r-- | tools/designer/translations/translations.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/translations/translations.pro b/tools/designer/translations/translations.pro index 8395259..c8cd76d 100644 --- a/tools/designer/translations/translations.pro +++ b/tools/designer/translations/translations.pro @@ -133,7 +133,7 @@ HEADERS += ../../shared/findwidget/abstractfindwidget.h \ TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/designer_de.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_pl.ts \ + $$[QT_INSTALL_TRANSLATIONS]/designer_ru.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_zh_TW.ts \ $$[QT_INSTALL_TRANSLATIONS]/designer_untranslated.ts - |