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

Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

Browse Source 
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp
This commit is contained in:
mae
2009-01-28 17:03:52 +01:00
parent 1cd553e6b8 e7cd1e23e7
commit fb01db4490
63 changed files with 1446 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/mainwindow.cpp
View File

@@ -120,7 +120,7 @@ MainWindow::MainWindow() :
m_editorManager(0),
m_fileManager(new FileManager(this)),
m_progressManager(new ProgressManagerPrivate()),
m_scriptManager(new ScriptManagerPrivate(this, m_coreImpl)),
m_scriptManager(new ScriptManagerPrivate(this)),
m_variableManager(new VariableManager(this)),
m_vcsManager(new VCSManager()),
m_viewManager(0),