diff options
| author | hjk <qtc-committer@nokia.com> | 2010-06-25 17:37:59 +0200 |
|---|---|---|
| committer | hjk <qtc-committer@nokia.com> | 2010-06-25 17:38:25 +0200 |
| commit | 2f5f358ff420bf4fa2fdc09d105463bd1e0e792f (patch) | |
| tree | a826357ccde587a1cce12749ff5fbb0ae8ac6f79 /src/plugins/coreplugin/designmode.cpp | |
| parent | 2bdf10ce1077fc21f6a3835de1f103f87c75eebf (diff) | |
| download | qt-creator-2f5f358ff420bf4fa2fdc09d105463bd1e0e792f.tar.gz | |
Core::Context: compile hot fix for Windows.
Diffstat (limited to 'src/plugins/coreplugin/designmode.cpp')
| -rw-r--r-- | src/plugins/coreplugin/designmode.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/plugins/coreplugin/designmode.cpp b/src/plugins/coreplugin/designmode.cpp index 91fa3ee3f9..cbd289b54d 100644 --- a/src/plugins/coreplugin/designmode.cpp +++ b/src/plugins/coreplugin/designmode.cpp @@ -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) |