diff --git a/src/libs/utils/consoleprocess.h b/src/libs/utils/consoleprocess.h index a064542fe7c83d9dd83a889293b616d7e3fe4a4a..4a8c18ef52663e36a663290d482cc25a01b56798 100644 --- a/src/libs/utils/consoleprocess.h +++ b/src/libs/utils/consoleprocess.h @@ -71,9 +71,8 @@ public: void killProcess(); void killStub(); -#ifdef Q_OS_WIN qint64 applicationMainThreadID() const; -#else +#ifndef Q_OS_WIN void detachStub(); #endif diff --git a/src/libs/utils/consoleprocess_unix.cpp b/src/libs/utils/consoleprocess_unix.cpp index cc9474dbb54d37783a4531cea0f63e88c00b7693..c125a35f3d28b7f5d421e71570850bc7dd245d4f 100644 --- a/src/libs/utils/consoleprocess_unix.cpp +++ b/src/libs/utils/consoleprocess_unix.cpp @@ -32,6 +32,7 @@ #include "qtcprocess.h" #include <utils/hostosinfo.h> +#include <utils/qtcassert.h> #include <QCoreApplication> #include <QTimer> @@ -64,6 +65,12 @@ ConsoleProcess::ConsoleProcess(QObject *parent) : d->m_process.setProcessChannelMode(QProcess::ForwardedChannels); } +qint64 ConsoleProcess::applicationMainThreadID() const +{ + QTC_CHECK(false); + return -1; +} + void ConsoleProcess::setSettings(QSettings *settings) { d->m_settings = settings; diff --git a/src/plugins/debugger/gdb/termgdbadapter.cpp b/src/plugins/debugger/gdb/termgdbadapter.cpp index 9251be8f7c414485c22939c9bb9ac45f05c8e7ee..eed0681d570b9efc61786abeac7b7c5e82cfe46c 100644 --- a/src/plugins/debugger/gdb/termgdbadapter.cpp +++ b/src/plugins/debugger/gdb/termgdbadapter.cpp @@ -41,6 +41,8 @@ #include <QMessageBox> +using namespace Utils; + namespace Debugger { namespace Internal { @@ -120,12 +122,11 @@ void GdbTermEngine::setupInferior() { QTC_ASSERT(state() == InferiorSetupRequested, qDebug() << state()); const qint64 attachedPID = m_stubProc.applicationPID(); -#ifdef Q_OS_WIN const qint64 attachedMainThreadID = m_stubProc.applicationMainThreadID(); - showMessage(QString::fromLatin1("Attaching to %1 (%2)").arg(attachedPID).arg(attachedMainThreadID), LogMisc); -#else - showMessage(QString::fromLatin1("Attaching to %1").arg(attachedPID), LogMisc); -#endif + const QString msg = (attachedMainThreadID != -1) + ? QString::fromLatin1("Attaching to %1 (%2)").arg(attachedPID).arg(attachedMainThreadID) + : QString::fromLatin1("Attaching to %1").arg(attachedPID); + showMessage(msg, LogMisc); notifyInferiorPid(attachedPID); postCommand("attach " + QByteArray::number(attachedPID), CB(handleStubAttached)); @@ -143,11 +144,7 @@ void GdbTermEngine::handleStubAttached(const GdbResponse &response) } else { QString errorMessage; // Resume thread that was suspended by console stub process (see stub code). -#ifdef Q_OS_WIN const qint64 mainThreadId = m_stubProc.applicationMainThreadID(); -#else - const qint64 mainThreadId = -1; -#endif if (winResumeThread(mainThreadId, &errorMessage)) { showMessage(QString::fromLatin1("Inferior attached, thread %1 resumed"). arg(mainThreadId), LogMisc);