Merge lp:~zeller-benjamin/qtcreator-plugin-remotelinux/upstreamchanges into lp:qtcreator-plugin-remotelinux

[Benjamin Zeller]

Changes required to merge upstream

Changed that were required to merge upstream

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'src/remotelinux/abstractremotelinuxrunconfiguration.h'
--- src/remotelinux/abstractremotelinuxrunconfiguration.h	2014-04-09 10:50:27 +0000
+++ src/remotelinux/abstractremotelinuxrunconfiguration.h	2014-04-15 08:32:30 +0000
@@ -53,12 +53,7 @@
     virtual QString remoteExecutableFilePath() const = 0;
     virtual QStringList arguments() const = 0;
     virtual QString workingDirectory() const = 0;
-    virtual QString alternateRemoteExecutable() const = 0;
-    virtual bool useAlternateExecutable() const = 0;
     virtual Utils::Environment environment() const = 0;
-signals:
-    void deploySpecsChanged();
-    void targetInformationChanged() const;
 
 protected:
     AbstractRemoteLinuxRunConfiguration(ProjectExplorer::Target *parent,
 
=== modified file 'src/remotelinux/remotelinuxrunconfiguration.h'
--- src/remotelinux/remotelinuxrunconfiguration.h	2014-03-20 13:39:22 +0000
+++ src/remotelinux/remotelinuxrunconfiguration.h	2014-04-15 08:32:30 +0000
@@ -90,6 +90,10 @@
 
     static const char *IdPrefix;
 
+signals:
+    void deploySpecsChanged();
+    void targetInformationChanged() const;
+
 protected:
     RemoteLinuxRunConfiguration(ProjectExplorer::Target *parent,
         RemoteLinuxRunConfiguration *source);