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

Revert disabling of qml support (2.0.0 branch)

Browse Source 
This reverts commit 5234c775f7 and 210652912b.
This commit is contained in:
Kai Koehne
2010-06-07 13:42:27 +02:00
parent 47a7680ea4
commit b7ae49161a
6 changed files with 13 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmljseditor/qmljseditorplugin.cpp
View File

@@ -105,7 +105,6 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
m_editor = new QmlJSEditorFactory(this);
addObject(m_editor);
#ifdef QTCREATOR_WITH_QML
Core::BaseFileWizardParameters wizardParameters(Core::IWizard::FileWizard);
wizardParameters.setCategory(QLatin1String(Core::Constants::WIZARD_CATEGORY_QT));
wizardParameters.setDisplayCategory(QCoreApplication::translate("Core", Core::Constants::WIZARD_TR_CATEGORY_QT));
@@ -113,7 +112,6 @@ bool QmlJSEditorPlugin::initialize(const QStringList & /*arguments*/, QString *e
wizardParameters.setDisplayName(tr("Qt QML File"));
wizardParameters.setId(QLatin1String("Q.Qml"));
addAutoReleasedObject(new QmlFileWizard(wizardParameters, core));
#endif
m_actionHandler = new TextEditor::TextEditorActionHandler(QmlJSEditor::Constants::C_QMLJSEDITOR_ID,
TextEditor::TextEditorActionHandler::Format