diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-22 07:03:06 +1000 |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-04-22 07:03:06 +1000 |
| commit | db4e2a600c53ad857d7fa3f7d84ac995215ecf93 (patch) | |
| tree | 88ca89842925080cf18eb9f796310a89216828b0 /tools/linguist/linguist | |
| parent | 4f64ff3e8902529700336c7ad3aa9fccf5ca3e0b (diff) | |
| parent | c36ff16f66ffd65839ba1e254ac557e491db6bf4 (diff) | |
Merge branch '4.5'
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'tools/linguist/linguist')
| -rw-r--r-- | tools/linguist/linguist/linguist.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro index 417ef67f5c..968293a56b 100644 --- a/tools/linguist/linguist/linguist.pro +++ b/tools/linguist/linguist/linguist.pro @@ -100,7 +100,6 @@ RESOURCES += linguist.qrc TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/linguist_ja.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_pl.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_untranslated.ts \ - $$[QT_INSTALL_TRANSLATIONS]/linguist_tr_TR.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_CN.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_TW.ts \ $$[QT_INSTALL_TRANSLATIONS]/linguist_de.ts \ |