feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.5'

Browse Source
This commit is contained in:
Eike Ziller
2012-05-07 15:18:39 +02:00
parent d7f6bc3369 b63135c067
commit 529c0a8fe2
36 changed files with 7212 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmljseditor/qmljseditorfactory.cpp
View File

@@ -46,6 +46,7 @@
#include <coreplugin/infobar.h>
#include <coreplugin/editormanager/editormanager.h>
#include <QCoreApplication>
#include <QFileInfo>
#include <QDebug>
#include <QSettings>
@@ -74,7 +75,7 @@ Core::Id QmlJSEditorFactory::id() const
QString QmlJSEditorFactory::displayName() const
{
return tr(C_QMLJSEDITOR_DISPLAY_NAME);
return qApp->translate("OpenWith::Editors", C_QMLJSEDITOR_DISPLAY_NAME);
}
Core::IEditor *QmlJSEditorFactory::createEditor(QWidget *parent)