Merge remote-tracking branch 'origin/2.5'

This commit is contained in:
Eike Ziller
2012-05-07 15:18:39 +02:00
36 changed files with 7212 additions and 1120 deletions

View File

@@ -105,7 +105,7 @@ Core::Id CppEditorFactory::id() const
QString CppEditorFactory::displayName() const
{
return tr(CppEditor::Constants::CPPEDITOR_DISPLAY_NAME);
return qApp->translate("OpenWith::Editors", CppEditor::Constants::CPPEDITOR_DISPLAY_NAME);
}
Core::IEditor *CppEditorFactory::createEditor(QWidget *parent)