diff options
| author | Eike Ziller <[email protected]> | 2024-03-20 15:01:51 +0100 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2024-03-20 15:05:58 +0100 |
| commit | 90e1d96019e49c9c374082cdadd7da72e711e60c (patch) | |
| tree | 3d572235b52c80017ec91579b5c2272ce5898f90 /src/plugins/remotelinux/linuxdevice.h | |
| parent | aaf839bcf0e0ee5b77f47fcc47b4c18c2bbe31b3 (diff) | |
| parent | f75e26005fc6f6650393fca7c5189305f8938b2f (diff) | |
Merge remote-tracking branch 'origin/13.0'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
doc/qtcreator/src/overview/creator-only/creator-keyboard-shortcuts.qdoc
qbs/modules/qtc/qtc.qbs
src/plugins/remotelinux/linuxdevicetester.cpp
Change-Id: I8434e41dcfbb50f6ed032a3e0af1591eb19b79eb
Diffstat (limited to 'src/plugins/remotelinux/linuxdevice.h')
| -rw-r--r-- | src/plugins/remotelinux/linuxdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/remotelinux/linuxdevice.h b/src/plugins/remotelinux/linuxdevice.h index 0bb2468eacb..06e0da3f2a8 100644 --- a/src/plugins/remotelinux/linuxdevice.h +++ b/src/plugins/remotelinux/linuxdevice.h @@ -50,7 +50,7 @@ public: bool isDisconnected() const; void setDisconnected(bool disconnected); - QFuture<bool> tryToConnect(); + bool tryToConnect(); protected: LinuxDevice(); |