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

Merge branch '2.3'

Browse Source 
Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
This commit is contained in:
Oswald Buddenhagen
2011-07-29 17:57:59 +02:00
parent 242b4280f9 7aaab4d050
commit 65c0eb5165
135 changed files with 7595 additions and 4403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1113,7 +1113,7 @@ DebuggerPluginPrivate::DebuggerPluginPrivate(DebuggerPlugin *plugin) :
qRegisterMetaType<ContextData>("ContextData");
qRegisterMetaType<DebuggerStartParameters>("DebuggerStartParameters");
QTC_ASSERT(!theDebuggerCore, /**/);
QTC_CHECK(!theDebuggerCore);
theDebuggerCore = this;
m_plugin = plugin;
@@ -1350,7 +1350,7 @@ void DebuggerPluginPrivate::onCurrentProjectChanged(Project *project)
Target *target = project->activeTarget();
QTC_ASSERT(target, return);
activeRc = target->activeRunConfiguration();
QTC_ASSERT(activeRc, /**/);
QTC_CHECK(activeRc);
}
for (int i = 0, n = m_snapshotHandler->size(); i != n; ++i) {
// Run controls might be deleted during exit.
@@ -3148,7 +3148,7 @@ void DebuggerPluginPrivate::extensionsInitialized()
SIGNAL(startupProjectChanged(ProjectExplorer::Project*)),
SLOT(onCurrentProjectChanged(ProjectExplorer::Project*)));
QTC_ASSERT(m_coreSettings, /**/);
QTC_CHECK(m_coreSettings);
m_globalDebuggerOptions->fromSettings(m_coreSettings);
m_watchersWindow->setVisible(false);
m_returnWindow->setVisible(false);