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

DesignMode: Create only when needed

Browse Source 
Postpone the Mode object creation until it is really necessary,
the private data object may be needed before.

In the QmlDesigner this patch moves the connection to the DesignMode
instance back to delayedInitialize, essentially reverting part of
e8b3b8140b.

Change-Id: I07146b0bc93eede09af8e824e916edb6de1817ef
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2018-01-23 10:33:18 +01:00
parent 33184a1e29
commit a5935cb27a
5 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/coreplugin.cpp
View File

@@ -71,7 +71,6 @@ using namespace Utils;
CorePlugin::CorePlugin()
: m_mainWindow(0)
, m_editMode(0)
, m_designMode(0)
, m_locator(0)
{
qRegisterMetaType<Id>();
@@ -90,11 +89,7 @@ CorePlugin::~CorePlugin()
delete m_editMode;
}
if (m_designMode) {
if (DesignMode::designModeIsRequired())
removeObject(m_designMode);
delete m_designMode;
}
DesignMode::destroyModeIfRequired();
delete m_mainWindow;
setCreatorTheme(0);
@@ -159,7 +154,6 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
m_editMode = new EditMode;
addObject(m_editMode);
ModeManager::activateMode(m_editMode->id());
m_designMode = new DesignMode;
InfoBar::initialize(ICore::settings(), creatorTheme());
}
@@ -226,8 +220,7 @@ bool CorePlugin::initialize(const QStringList &arguments, QString *errorMessage)
void CorePlugin::extensionsInitialized()
{
if (DesignMode::designModeIsRequired())
addObject(m_designMode);
DesignMode::createModeIfRequired();
Find::extensionsInitialized();
m_locator->extensionsInitialized();
m_mainWindow->extensionsInitialized();