diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 10:43:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-04-12 11:34:46 +0200 |
| commit | 5c874322603444ef02bd578ae302c03a9b1cd034 (patch) | |
| tree | 6339db7c3a2683e18208e75895444f2d2d251ebe /src/plugins/remotelinux/linuxdevice.h | |
| parent | 04acb9d643060811dbba8f66d807b2a7574c3a6f (diff) | |
| parent | 8dadafb9e0a2fbb49ab08b9eea0ff307088ba3f8 (diff) | |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
Diffstat (limited to 'src/plugins/remotelinux/linuxdevice.h')
| -rw-r--r-- | src/plugins/remotelinux/linuxdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/remotelinux/linuxdevice.h b/src/plugins/remotelinux/linuxdevice.h index c834bfa519..f9469abeb5 100644 --- a/src/plugins/remotelinux/linuxdevice.h +++ b/src/plugins/remotelinux/linuxdevice.h @@ -65,6 +65,7 @@ public: bool hasDeviceTester() const { return true; } ProjectExplorer::DeviceTester *createDeviceTester() const; ProjectExplorer::DeviceProcessSignalOperation::Ptr signalOperation() const; + ProjectExplorer::DeviceEnvironmentFetcher::Ptr environmentFetcher() const; protected: LinuxDevice() {} |