forked from qt-creator/qt-creator
Don't show Design mode if "designer" plugins are disabled/not present.
Change-Id: Iee0a01491075e1e82c17211b5e119bd5e167763b Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
This commit is contained in:
@@ -60,7 +60,8 @@ CorePlugin::~CorePlugin()
|
||||
}
|
||||
|
||||
if (m_designMode) {
|
||||
removeObject(m_designMode);
|
||||
if (m_designMode->designModeIsRequired())
|
||||
removeObject(m_designMode);
|
||||
delete m_designMode;
|
||||
}
|
||||
|
||||
@@ -90,7 +91,6 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
|
||||
addObject(m_editMode);
|
||||
m_mainWindow->modeManager()->activateMode(m_editMode->id());
|
||||
m_designMode = new DesignMode;
|
||||
addObject(m_designMode);
|
||||
}
|
||||
return success;
|
||||
}
|
||||
@@ -98,6 +98,8 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
|
||||
void CorePlugin::extensionsInitialized()
|
||||
{
|
||||
m_mainWindow->mimeDatabase()->syncUserModifiedMimeTypes();
|
||||
if (m_designMode->designModeIsRequired())
|
||||
addObject(m_designMode);
|
||||
m_mainWindow->extensionsInitialized();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user