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

Debugger: Do not pass -client for Windows-post-mortem debugging.

Browse Source 
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
Task-number: QTCREATORBUG-2827
This commit is contained in:
Friedemann Kleint
2010-10-20 15:17:19 +02:00
parent b2369973a4
commit e0e5923296
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/tools/qtcdebugger/main.cpp
View File

@@ -269,6 +269,7 @@ bool startCreatorAsDebugger(bool asClient, QString *errorMessage)
const QString dir = QApplication::applicationDirPath(); const QString dir = QApplication::applicationDirPath();
const QString binary = dir + QLatin1Char('/') + QLatin1String(creatorBinaryC); const QString binary = dir + QLatin1Char('/') + QLatin1String(creatorBinaryC);
QStringList args; QStringList args;
// Send to running Creator: Unstable with directly linked CDB engine.
if (asClient) if (asClient)
args << QLatin1String("-client"); args << QLatin1String("-client");
args << QLatin1String("-debug") << QString::number(argProcessId) args << QLatin1String("-debug") << QString::number(argProcessId)
@@ -356,8 +357,10 @@ bool chooseDebugger(QString *errorMessage)
if (msgBox.clickedButton() == creatorButton) { if (msgBox.clickedButton() == creatorButton) {
// Just in case, default to standard. Do not run as client in the unlikely case // Just in case, default to standard. Do not run as client in the unlikely case
// Creator crashed // Creator crashed
// TODO: pass asClient=true for new CDB engine.
const bool canRunAsClient = !processName.contains(QLatin1String(creatorBinaryC), Qt::CaseInsensitive); const bool canRunAsClient = !processName.contains(QLatin1String(creatorBinaryC), Qt::CaseInsensitive);
if (startCreatorAsDebugger(canRunAsClient, errorMessage)) Q_UNUSED(canRunAsClient)
if (startCreatorAsDebugger(false, errorMessage))
return true; return true;
return startDefaultDebugger(errorMessage); return startDefaultDebugger(errorMessage);
} }
@@ -478,7 +481,8 @@ int main(int argc, char *argv[])
usage(QCoreApplication::applicationFilePath(), errorMessage); usage(QCoreApplication::applicationFilePath(), errorMessage);
break; break;
case ForceCreatorMode: case ForceCreatorMode:
ex = startCreatorAsDebugger(true, &errorMessage) ? 0 : -1; // TODO: pass asClient=true for new CDB engine.
ex = startCreatorAsDebugger(false, &errorMessage) ? 0 : -1;
break; break;
case ForceDefaultMode: case ForceDefaultMode:
ex = startDefaultDebugger(&errorMessage) ? 0 : -1; ex = startDefaultDebugger(&errorMessage) ? 0 : -1;