Commit f99e2570 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh

Support multiple instances listening for debug output...

... only not simultaneously

Task-number: QTCREATORBUG-3443
Change-Id: Ie88ee305a1ad134d81a19cece42f7fd81fc08f16
Reviewed-by: default avatarFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>
parent 349f4150
......@@ -33,6 +33,7 @@
#include "projectexplorersettings.h"
#include "runconfiguration.h"
#include "session.h"
#include "windebuginterface.h"
#include <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/coreconstants.h>
......@@ -203,6 +204,11 @@ AppOutputPane::AppOutputPane() :
this, SLOT(aboutToUnloadSession()));
connect(ProjectExplorerPlugin::instance(), SIGNAL(settingsChanged()),
this, SLOT(updateFromSettings()));
#ifdef Q_OS_WIN
connect(this, &AppOutputPane::allRunControlsFinished,
WinDebugInterface::instance(), &WinDebugInterface::stop);
#endif
}
AppOutputPane::~AppOutputPane()
......
......@@ -56,20 +56,25 @@ WinDebugInterface *WinDebugInterface::instance()
return m_instance;
}
bool WinDebugInterface::stop()
{
if (!m_waitHandles[TerminateEventHandle])
return false;
SetEvent(m_waitHandles[TerminateEventHandle]);
return true;
}
WinDebugInterface::WinDebugInterface(QObject *parent) :
QThread(parent)
{
m_instance = this;
setObjectName(QLatin1String("WinDebugInterfaceThread"));
start();
}
WinDebugInterface::~WinDebugInterface()
{
if (m_waitHandles[TerminateEventHandle]) {
SetEvent(m_waitHandles[TerminateEventHandle]);
if (stop())
wait(500);
}
m_instance = 0;
}
......
......@@ -46,6 +46,8 @@ public:
static WinDebugInterface *instance();
bool stop();
signals:
void debugOutput(qint64 pid, const QString &message);
void cannotRetrieveDebugOutput();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment