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

Core::Context: compile hot fix for Windows.

Browse Source
This commit is contained in:
hjk
2010-06-25 17:37:59 +02:00
parent 2bdf10ce10
commit 2f5f358ff4
63 changed files with 199 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/coreplugin/designmode.cpp
View File

@@ -31,7 +31,6 @@
#include <coreplugin/icore.h>
#include <coreplugin/modemanager.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/openeditorsmodel.h>
#include <coreplugin/actionmanager/actionmanager.h>
@@ -136,8 +135,7 @@ DesignMode::~DesignMode()
Context DesignMode::context() const
{
static Context contexts(
Core::UniqueIDManager::instance()->uniqueIdentifier(Constants::C_DESIGN_MODE));
static Context contexts(Constants::C_DESIGN_MODE);
return contexts;
}
@@ -269,7 +267,7 @@ void DesignMode::updateContext(Core::IMode *newMode, Core::IMode *oldMode)
void DesignMode::setActiveContext(const Context &context)
{
if (d->m_activeContext == context)
if (d->m_activeContext.d == context.d)
return;
if (ModeManager::instance()->currentMode() == this)