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

RemoteLinux: Serialize the "disconnected" state

Browse Source 
Otherwise permanently unreachable devices will keep causing annoying
delays after every restart.

Change-Id: I85c6fd0a6964c7f25e4b61b8eb092fc606b146ad
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
Christian Kandeler
2024-06-10 14:49:37 +02:00
parent 64ebf36f15
commit 6e4fbed511
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -58,6 +58,8 @@ using namespace Utils;
namespace RemoteLinux { namespace RemoteLinux {
const char DisconnectedKey[] = "Disconnected";
const QByteArray s_pidMarker = "__qtc"; const QByteArray s_pidMarker = "__qtc";
static Q_LOGGING_CATEGORY(linuxDeviceLog, "qtc.remotelinux.device", QtWarningMsg); static Q_LOGGING_CATEGORY(linuxDeviceLog, "qtc.remotelinux.device", QtWarningMsg);
@@ -1063,6 +1065,19 @@ LinuxDevice::LinuxDevice()
}}); }});
} }
void LinuxDevice::fromMap(const Utils::Store &map)
{
IDevice::fromMap(map);
d->m_disconnected = map.value(DisconnectedKey, false).toBool();
}
Store LinuxDevice::toMap() const
{
Store map = IDevice::toMap();
map.insert(DisconnectedKey, d->m_disconnected);
return map;
}
void LinuxDevice::_setOsType(Utils::OsType osType) void LinuxDevice::_setOsType(Utils::OsType osType)
{ {
qCDebug(linuxDeviceLog) << "Setting OS type to" << osType << "for" << displayName(); qCDebug(linuxDeviceLog) << "Setting OS type to" << osType << "for" << displayName();

3
src/plugins/remotelinux/linuxdevice.h
View File

@@ -55,6 +55,9 @@ public:
protected: protected:
LinuxDevice(); LinuxDevice();
void fromMap(const Utils::Store &map) override;
Utils::Store toMap() const override;
void _setOsType(Utils::OsType osType); void _setOsType(Utils::OsType osType);
class LinuxDevicePrivate *d; class LinuxDevicePrivate *d;