From 3768e32f891a90ce77c52417a442aefb1fcddd23 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 10 Jul 2013 17:58:38 +0200 Subject: [PATCH] QmlDesigner.DesignDocument: getting rid of the magical StackedWidget This StackedWidget is a leftover from the stand alone version. In the context of Qt Creator this makes no sense anymore. Change-Id: I6660dd4b43bdc12fa3329d333158fa759bee4d88 Reviewed-by: Marco Bubke --- .../qmldesigner/components/integration/designdocument.cpp | 3 --- .../qmldesigner/components/integration/designdocument.h | 1 - 2 files changed, 4 deletions(-) diff --git a/src/plugins/qmldesigner/components/integration/designdocument.cpp b/src/plugins/qmldesigner/components/integration/designdocument.cpp index 8cc3e421d95..cb5965b79e1 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.cpp +++ b/src/plugins/qmldesigner/components/integration/designdocument.cpp @@ -334,9 +334,6 @@ void DesignDocument::activateCurrentModel(TextModifier *textModifier) QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); Q_ASSERT(m_documentModel); - if (!plainTextEdit()->parent()) // hack to prevent changing owner of external text edit - m_stackedWidget->addWidget(plainTextEdit()); - viewManager().attachRewriterView(textModifier); Q_ASSERT(m_documentModel); diff --git a/src/plugins/qmldesigner/components/integration/designdocument.h b/src/plugins/qmldesigner/components/integration/designdocument.h index adc61dfe39a..292ff1ec896 100644 --- a/src/plugins/qmldesigner/components/integration/designdocument.h +++ b/src/plugins/qmldesigner/components/integration/designdocument.h @@ -145,7 +145,6 @@ private: // functions Model *createInFileComponentModel(); private: // variables - QScopedPointer m_stackedWidget; QScopedPointer m_documentModel; QScopedPointer m_inFileComponentModel; QWeakPointer m_textEditor;