summaryrefslogtreecommitdiffstats
path: root/tools/qtconfig
diff options
context:
space:
mode:
authorBill King <bill.king@nokia.com>2009-07-08 22:41:01 (GMT)
committerBill King <bill.king@nokia.com>2009-07-08 22:41:01 (GMT)
commit7b980974b14d246f60d824bab4e069ac8cc2da29 (patch)
tree68f0d1667760a0e7e27d57fc76c0434dc028502c /tools/qtconfig
parentcfacb284593008094136905a2497843a4bbac639 (diff)
parent48f049d6fbddd60d99fb6ebc15fd5b52a3b515ec (diff)
downloadQt-7b980974b14d246f60d824bab4e069ac8cc2da29.zip
Qt-7b980974b14d246f60d824bab4e069ac8cc2da29.tar.gz
Qt-7b980974b14d246f60d824bab4e069ac8cc2da29.tar.bz2
Merge commit 'origin/4.5'
Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
Diffstat (limited to 'tools/qtconfig')
-rw-r--r--tools/qtconfig/translations/translations.pro1
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/qtconfig/translations/translations.pro b/tools/qtconfig/translations/translations.pro
index fbbdb2bba2..1f9f572 100644
--- a/tools/qtconfig/translations/translations.pro
+++ b/tools/qtconfig/translations/translations.pro
@@ -8,6 +8,7 @@ HEADERS += ../colorbutton.h ../previewframe.h ../previewwidget.h ../mainw
FORMS = ../mainwindowbase.ui ../paletteeditoradvancedbase.ui ../previewwidgetbase.ui
TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qtconfig_pl.ts \
+ $$[QT_INSTALL_TRANSLATIONS]/qtconfig_ru.ts \
$$[QT_INSTALL_TRANSLATIONS]/qtconfig_untranslated.ts \
$$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_CN.ts \
$$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_TW.ts