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

Fix QML to UTF-8, unless changed in editor

Browse Source 
Task-id: QTCREATORBUG-3424
This commit is contained in:
mae
2010-12-20 18:10:50 +01:00
parent 96475f9553
commit 4226538ac3
6 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qmljseditor/qmljseditor.cpp
View File

@@ -659,6 +659,7 @@ QmlJSTextEditor::QmlJSTextEditor(QWidget *parent) :
connect(m_cursorPositionTimer, SIGNAL(timeout()), this, SLOT(updateCursorPositionNow()));
baseTextDocument()->setSyntaxHighlighter(new Highlighter(document()));
baseTextDocument()->setCodec(QTextCodec::codecForName("UTF-8")); // qml files are defined to be utf-8
m_modelManager = ExtensionSystem::PluginManager::instance()->getObject<ModelManagerInterface>();
m_contextPane = ExtensionSystem::PluginManager::instance()->getObject<QmlJS::IContextPane>();

7
src/plugins/qmljseditor/qmljseditoreditable.cpp
View File

@@ -93,4 +93,11 @@ QString QmlJSEditorEditable::preferredModeType() const
return QString();
}
void QmlJSEditorEditable::setTextCodec(QTextCodec *codec, TextCodecReason reason)
{
if (reason != TextCodecOtherReason) // qml is defined to be utf8
return;
editor()->setTextCodec(codec);
}
} // namespace QmlJSEditor

2
src/plugins/qmljseditor/qmljseditoreditable.h
View File

@@ -54,6 +54,8 @@ public:
bool isTemporary() const { return false; }
virtual bool open(const QString & fileName);
virtual QString preferredModeType() const;
void setTextCodec(QTextCodec *codec, TextCodecReason = TextCodecOtherReason);
private:
Core::Context m_context;