aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2010-03-09 12:21:22 +0100
committercon <qtc-committer@nokia.com>2010-03-09 18:14:15 +0100
commit837daa84ac8d932c488afc90cbd14b5a4440a6c3 (patch)
treef43e6846fd784fdb550bdfd35b27157068ce5cdb
parentf27e9f2c4cae94c85f5518f8317a35c15383fbb0 (diff)
QmlDesigner: Disable switching to Component elements for the Alpha
Changing anything in the submodel right now crashes, and it seems it will take some time to fix this. Reviewed-by: Thomas Hartmann (cherry picked from commit 961cdd5e173e5e60a01dcf165de7cc7804df889a)
-rw-r--r--src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
index 58447b3d28..a6bf9b3f58 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
@@ -421,7 +421,8 @@ void DesignDocumentController::loadCurrentModel()
m_d->stackedWidget->addWidget(m_d->formEditorView->widget());
ComponentAction *componentAction = new ComponentAction(m_d->formEditorView->widget());
componentAction->setModel(m_d->model.data());
- m_d->formEditorView->widget()->lowerToolBox()->addAction(componentAction);
+ // TODO: Enable again
+ //m_d->formEditorView->widget()->lowerToolBox()->addAction(componentAction);
connect(componentAction, SIGNAL(currentComponentChanged(ModelNode)), SLOT(changeCurrentModelTo(ModelNode))); //TODO component action
connect(m_d->itemLibrary.data(), SIGNAL(itemActivated(const QString&)), m_d->formEditorView.data(), SLOT(activateItemCreator(const QString&)));
}