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

Debugger: Move addQmlServerInferiorCommandLineArgumentIfNeeded()

Browse Source 
Into DebuggerRunParameters.

Change-Id: I7fc0d32fd10604c8a7fd13e0e4348ed35af1bf06
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2025-01-13 18:51:29 +01:00
parent a0fe1d329b
commit 4a619fec89
4 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/debugger/debuggerengine.h
View File

@@ -268,6 +268,9 @@ public:
void setServerEssential(bool on) { m_serverEssential = on; } void setServerEssential(bool on) { m_serverEssential = on; }
bool serverEssential() const { return m_serverEssential; } bool serverEssential() const { return m_serverEssential; }
void setAddQmlServerInferiorCmdArgIfNeeded(bool on) { m_addQmlServerInferiorCmdArgIfNeeded = on; }
bool isAddQmlServerInferiorCmdArgIfNeeded() const { return m_addQmlServerInferiorCmdArgIfNeeded; }
private: private:
DebuggerStartMode m_startMode = NoStartMode; DebuggerStartMode m_startMode = NoStartMode;
DebuggerCloseMode m_closeMode = KillAtClose; DebuggerCloseMode m_closeMode = KillAtClose;
@@ -364,6 +367,7 @@ private:
Utils::ProcessHandle m_serverAttachPid; Utils::ProcessHandle m_serverAttachPid;
bool m_serverUseMulti = true; bool m_serverUseMulti = true;
bool m_serverEssential = true; bool m_serverEssential = true;
bool m_addQmlServerInferiorCmdArgIfNeeded = false;
}; };
namespace Internal { namespace Internal {

12
src/plugins/debugger/debuggerruncontrol.cpp
View File

@@ -79,7 +79,6 @@ static QString noDebuggerInKitMessage()
class DebuggerRunToolPrivate class DebuggerRunToolPrivate
{ {
public: public:
bool addQmlServerInferiorCommandLineArgumentIfNeeded = false;
int snapshotCounter = 0; int snapshotCounter = 0;
int engineStartsNeeded = 0; int engineStartsNeeded = 0;
int engineStopsNeeded = 0; int engineStopsNeeded = 0;
@@ -100,11 +99,6 @@ public:
} // namespace Internal } // namespace Internal
void DebuggerRunTool::addQmlServerInferiorCommandLineArgumentIfNeeded()
{
d->addQmlServerInferiorCommandLineArgumentIfNeeded = true;
}
void DebuggerRunTool::start() void DebuggerRunTool::start()
{ {
startCoreFileSetupIfNeededAndContinueStartup(); startCoreFileSetupIfNeededAndContinueStartup();
@@ -221,13 +215,13 @@ void DebuggerRunTool::continueAfterTerminalStart()
if (runControl()->usesQmlChannel()) { if (runControl()->usesQmlChannel()) {
m_runParameters.setQmlServer(runControl()->qmlChannel()); m_runParameters.setQmlServer(runControl()->qmlChannel());
if (d->addQmlServerInferiorCommandLineArgumentIfNeeded if (m_runParameters.isAddQmlServerInferiorCmdArgIfNeeded()
&& m_runParameters.isQmlDebugging() && m_runParameters.isQmlDebugging()
&& m_runParameters.isCppDebugging()) { && m_runParameters.isCppDebugging()) {
int qmlServerPort = m_runParameters.qmlServer().port(); const int qmlServerPort = m_runParameters.qmlServer().port();
QTC_ASSERT(qmlServerPort > 0, reportFailure(); return); QTC_ASSERT(qmlServerPort > 0, reportFailure(); return);
QString mode = QString("port:%1").arg(qmlServerPort); const QString mode = QString("port:%1").arg(qmlServerPort);
auto inferior = m_runParameters.inferior(); auto inferior = m_runParameters.inferior();
CommandLine cmd{inferior.command.executable()}; CommandLine cmd{inferior.command.executable()};

1
src/plugins/debugger/debuggerruncontrol.h
View File

@@ -33,7 +33,6 @@ public:
void kickoffTerminalProcess(); void kickoffTerminalProcess();
void interruptTerminal(); void interruptTerminal();
void addQmlServerInferiorCommandLineArgumentIfNeeded();
void setupPortsGatherer(); void setupPortsGatherer();
DebuggerRunParameters &runParameters() { return m_runParameters; } DebuggerRunParameters &runParameters() { return m_runParameters; }

2
src/plugins/remotelinux/remotelinuxdebugsupport.cpp
View File

@@ -51,7 +51,7 @@ public:
DebuggerRunParameters &rp = debugger->runParameters(); DebuggerRunParameters &rp = debugger->runParameters();
debugger->setId("RemoteLinuxDebugWorker"); debugger->setId("RemoteLinuxDebugWorker");
debugger->setupPortsGatherer(); debugger->setupPortsGatherer();
debugger->addQmlServerInferiorCommandLineArgumentIfNeeded(); rp.setAddQmlServerInferiorCmdArgIfNeeded(true);
rp.setStartMode(AttachToRemoteServer); rp.setStartMode(AttachToRemoteServer);
rp.setCloseMode(KillAndExitMonitorAtClose); rp.setCloseMode(KillAndExitMonitorAtClose);