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

QmlDesigner: get rid of Qt/ - use QtQuick/ instead

Browse Source 
Qt 4.7 imports are converted to QtQuick 1.0 imports.
This commit is contained in:
Thomas Hartmann
2011-03-01 15:00:25 +01:00
parent 26a3014ef5
commit 0a02b85ece
13 changed files with 50 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
View File

@@ -275,7 +275,7 @@ QList<RewriterView::Error> DesignDocumentController::loadMaster(QPlainTextEdit *
//m_d->masterModel = Model::create(m_d->textModifier, m_d->searchPath, errors);
m_d->masterModel = Model::create("Qt/Rectangle", 4, 7);
m_d->masterModel = Model::create("QtQuick/Rectangle", 1, 0);
#if defined(VIEWLOGGER)
m_d->viewLogger = new Internal::ViewLogger(m_d->model.data());
@@ -284,7 +284,7 @@ QList<RewriterView::Error> DesignDocumentController::loadMaster(QPlainTextEdit *
m_d->masterModel->setFileUrl(m_d->searchPath);
m_d->subComponentModel = Model::create("Qt/Rectangle", 4, 7);
m_d->subComponentModel = Model::create("QtQuick/Rectangle", 1, 0);
m_d->subComponentModel->setFileUrl(m_d->searchPath);
m_d->subComponentManager = new SubComponentManager(m_d->masterModel->metaInfo(), this);
@@ -775,7 +775,7 @@ QString DesignDocumentController::contextHelpId() const
QString helpId;
if (!nodes.isEmpty()) {
helpId = nodes.first().type();
helpId.replace("Qt/", "QML.");
helpId.replace("QtQuick/", "QML.");
}
return helpId;