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/remotelinuxenvironmentreader.h | |
parent | 04acb9d643060811dbba8f66d807b2a7574c3a6f (diff) | |
parent | 8dadafb9e0a2fbb49ab08b9eea0ff307088ba3f8 (diff) | |
download | qt-creator-5c874322603444ef02bd578ae302c03a9b1cd034.tar.gz |
Merge remote-tracking branch 'origin/4.0'
Conflicts:
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f
Diffstat (limited to 'src/plugins/remotelinux/remotelinuxenvironmentreader.h')
-rw-r--r-- | src/plugins/remotelinux/remotelinuxenvironmentreader.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/plugins/remotelinux/remotelinuxenvironmentreader.h b/src/plugins/remotelinux/remotelinuxenvironmentreader.h index 99db24ee08..3642a556e0 100644 --- a/src/plugins/remotelinux/remotelinuxenvironmentreader.h +++ b/src/plugins/remotelinux/remotelinuxenvironmentreader.h @@ -25,15 +25,12 @@ #pragma once +#include <projectexplorer/devicesupport/idevice.h> #include <utils/environment.h> #include <QObject> -namespace ProjectExplorer { -class DeviceProcess; -class Kit; -class RunConfiguration; -} +namespace ProjectExplorer { class DeviceProcess; } namespace RemoteLinux { namespace Internal { @@ -43,29 +40,27 @@ class RemoteLinuxEnvironmentReader : public QObject Q_OBJECT public: - RemoteLinuxEnvironmentReader(ProjectExplorer::RunConfiguration *config, QObject *parent = 0); - + RemoteLinuxEnvironmentReader(const ProjectExplorer::IDevice::ConstPtr &device, + QObject *parent = 0); void start(); void stop(); Utils::Environment remoteEnvironment() const { return m_env; } + void handleCurrentDeviceConfigChanged(); signals: void finished(); void error(const QString &error); -private slots: +private: void handleError(); - void handleCurrentDeviceConfigChanged(); void remoteProcessFinished(); - -private: void setFinished(); void destroyProcess(); bool m_stop; Utils::Environment m_env; - ProjectExplorer::Kit *m_kit; + ProjectExplorer::IDevice::ConstPtr m_device; ProjectExplorer::DeviceProcess *m_deviceProcess; }; |