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

qtcassert: move actual printing to separate function and enforce style

Browse Source 
This also allows simple setting of breakpoints on failed asserts.

Change-Id: I6dd84cbfaf659d57e39f3447386cebc0221b2b84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
hjk
2012-04-17 08:01:25 +02:00
committed by hjk
parent 37e3853090
commit 5b0bf61640
95 changed files with 347 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -443,7 +443,7 @@ void QmlEngine::beginConnection(quint16 port)
if (state() != EngineRunRequested && d->m_retryOnConnectFail)
return;
QTC_ASSERT(state() == EngineRunRequested, return)
QTC_ASSERT(state() == EngineRunRequested, return);
if (port > 0) {
QTC_CHECK(startParameters().communicationChannel
@@ -451,7 +451,7 @@ void QmlEngine::beginConnection(quint16 port)
QTC_ASSERT(startParameters().connParams.port == 0
|| startParameters().connParams.port == port,
qWarning() << "Port " << port << "from application output does not match"
<< startParameters().connParams.port << "from start parameters.")
<< startParameters().connParams.port << "from start parameters.");
d->m_adapter.beginConnectionTcp(startParameters().qmlServerAddress, port);
return;
}