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

Merge remote-tracking branch 'origin/2.3'

Browse Source 
Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
This commit is contained in:
Eike Ziller
2011-07-15 14:29:07 +02:00
parent ab8713d792 dbc0fa0919
commit e5ca4b3462
271 changed files with 6421 additions and 9989 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggerplugin.cpp
View File

@@ -2584,7 +2584,9 @@ void DebuggerPluginPrivate::extensionsInitialized()
ICore *core = ICore::instance();
QTC_ASSERT(core, return);
m_coreSettings = core->settings();
m_debuggerSettings = new DebuggerSettings(m_coreSettings);
m_debuggerSettings->readSettings();
connect(core, SIGNAL(coreAboutToClose()), this, SLOT(coreShutdown()));
@@ -2776,8 +2778,6 @@ void DebuggerPluginPrivate::extensionsInitialized()
m_commonOptionsPage = new CommonOptionsPage(m_globalDebuggerOptions);
m_plugin->addAutoReleasedObject(m_commonOptionsPage);
m_debuggerSettings->readSettings();
// Do not fail to load the whole plugin if something goes wrong here.
QString errorMessage;
if (!parseArguments(m_arguments, &m_cmdLineEnabledEngines, &errorMessage)) {