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

Debugger: Dont use win64interrupt.exe in some case

Browse Source 
If everything is built with 32 bitness there is no need
to call win64interrupt.exe

Task-number: QTCREATORBUG-7891

Change-Id: I1981b0dfd0ff08ff8acce0e5b81858b00f536ded
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
David Schulz
2012-11-13 13:28:05 +01:00
committed by hjk
parent cd7c91d440
commit eb39b57e24
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -376,6 +376,7 @@ CdbEngine::CdbEngine(const DebuggerStartParameters &sp, const OptionsPtr &option
m_operateByInstruction(true), // Default CDB setting
m_notifyEngineShutdownOnTermination(false),
m_hasDebuggee(false),
m_cdbIs64Bit(false),
m_elapsedLogTime(0),
m_sourceStepInto(false),
m_watchPointX(0),
@@ -641,13 +642,13 @@ bool CdbEngine::launchCDB(const DebuggerStartParameters &sp, QString *errorMessa
return false;
}
const bool is64bit =
m_cdbIs64Bit =
#ifdef Q_OS_WIN
Utils::winIs64BitBinary(executable);
#else
false;
#endif
const QFileInfo extensionFi(CdbEngine::extensionLibraryName(is64bit));
const QFileInfo extensionFi(CdbEngine::extensionLibraryName(m_cdbIs64Bit));
if (!extensionFi.isFile()) {
*errorMessage = QString::fromLatin1("Internal error: The extension %1 cannot be found.").
arg(QDir::toNativeSeparators(extensionFi.absoluteFilePath()));
@@ -1163,7 +1164,9 @@ bool CdbEngine::doInterruptInferior(SpecialStopMode sm)
showMessage(QString::fromLatin1("Interrupting process %1...").arg(inferiorPid()), LogMisc);
QString errorMessage;
const bool ok = interruptProcess(inferiorPid(), CdbEngineType, &errorMessage);
const bool ok = interruptProcess(inferiorPid(), CdbEngineType,
&errorMessage, m_cdbIs64Bit);
if (!ok) {
m_specialStopMode = oldSpecialMode;
showMessage(errorMessage, LogError);