diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-10-19 13:05:53 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-19 17:09:42 +0200 |
| commit | ba23e21d87e0ed533dbe1d172847b6642503c44c (patch) | |
| tree | 4013678fe048e9712ae1f28da8d7433fe4de99d7 /src/plugins/qmldesigner | |
| parent | 0ed824762c5b405b9d77cfda2e0bae2f01a61b61 (diff) | |
| download | qt-creator-ba23e21d87e0ed533dbe1d172847b6642503c44c.tar.gz | |
Don't show Design mode if "designer" plugins are disabled/not present.
Change-Id: Iee0a01491075e1e82c17211b5e119bd5e167763b
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Diffstat (limited to 'src/plugins/qmldesigner')
| -rw-r--r-- | src/plugins/qmldesigner/designmodewidget.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/qmldesignerplugin.cpp | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index 1532a96877..79387ff7ee 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -44,6 +44,7 @@ #include <toolbox.h> #include <coreplugin/coreconstants.h> +#include <coreplugin/designmode.h> #include <coreplugin/modemanager.h> #include <coreplugin/outputpane.h> #include <coreplugin/icore.h> @@ -224,10 +225,8 @@ DesignModeWidget::DesignModeWidget(QWidget *parent) : m_toggleRightSidebarAction = new QAction(tr("Toggle &Right Sidebar"), this); connect(m_toggleRightSidebarAction, SIGNAL(triggered()), SLOT(toggleRightSidebar())); - Core::ModeManager *modeManager = Core::ModeManager::instance(); - Core::IMode *designmode = modeManager->mode(Core::Constants::MODE_DESIGN); m_outputPlaceholderSplitter = new Core::MiniSplitter; - m_outputPanePlaceholder = new StyledOutputpanePlaceHolder(designmode, m_outputPlaceholderSplitter); + m_outputPanePlaceholder = new StyledOutputpanePlaceHolder(Core::DesignMode::instance(), m_outputPlaceholderSplitter); } DesignModeWidget::~DesignModeWidget() diff --git a/src/plugins/qmldesigner/qmldesignerplugin.cpp b/src/plugins/qmldesigner/qmldesignerplugin.cpp index 004779c121..ceb5adb313 100644 --- a/src/plugins/qmldesigner/qmldesignerplugin.cpp +++ b/src/plugins/qmldesigner/qmldesignerplugin.cpp @@ -359,7 +359,7 @@ void BauhausPlugin::updateActions(Core::IEditor* editor) void BauhausPlugin::extensionsInitialized() { - m_designMode = ExtensionSystem::PluginManager::instance()->getObject<Core::DesignMode>(); + m_designMode = Core::DesignMode::instance(); m_mimeTypes << "application/x-qml"; |