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

9
src/plugins/designer/formeditorw.cpp
View File

@@ -46,7 +46,6 @@
#include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h>
#include <coreplugin/helpmanager.h>
#include <coreplugin/uniqueidmanager.h>
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/actioncontainer.h>
#include <coreplugin/actionmanager/command.h>
@@ -174,8 +173,7 @@ FormEditorW::FormEditorW() :
m_fwm = qobject_cast<qdesigner_internal::QDesignerFormWindowManager*>(m_formeditor->formWindowManager());
QTC_ASSERT(m_fwm, return);
Core::UniqueIDManager *idMan = Core::UniqueIDManager::instance();
m_contexts << idMan->uniqueIdentifier(QLatin1String(Designer::Constants::C_FORMEDITOR));
m_contexts.add(Designer::Constants::C_FORMEDITOR);
setupActions();
@@ -331,11 +329,8 @@ void FormEditorW::fullInit()
layout->addWidget(m_editorWidget);
m_modeWidget->setLayout(layout);
Core::UniqueIDManager *idMan = Core::UniqueIDManager::instance();
int editorManagerContext = idMan->uniqueIdentifier(QLatin1String(Core::Constants::C_EDITORMANAGER));
Core::Context designerContexts = m_contexts;
designerContexts.append(Core::Context(editorManagerContext));
designerContexts.add(Core::Constants::C_EDITORMANAGER);
m_context = new DesignerContext(designerContexts, m_modeWidget, this);
m_core->addContextObject(m_context);