qtcreator-plugin-remotelinux

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

  1. upstreamchanges
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Merged at revision: 10
Proposed branch: lp:~zeller-benjamin/qtcreator-plugin-remotelinux/upstreamchanges
Merge into: lp:qtcreator-plugin-remotelinux
Diff against target: 31 lines (+4/-5)
2 files modified
src/remotelinux/abstractremotelinuxrunconfiguration.h (+0/-5)
src/remotelinux/remotelinuxrunconfiguration.h (+4/-0)
To merge this branch: bzr merge lp:~zeller-benjamin/qtcreator-plugin-remotelinux/upstreamchanges
Reviewer Review Type Date Requested Status
Zoltan Balogh Approve
Review via email: mp+215824@code.launchpad.net

Commit message

Changes required to merge upstream

Description of the change

Changed that were required to merge upstream

To post a comment you must log in.
Revision history for this message
Zoltan Balogh (bzoltan) wrote :

OK

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/remotelinux/abstractremotelinuxrunconfiguration.h'
2--- src/remotelinux/abstractremotelinuxrunconfiguration.h 2014-04-09 10:50:27 +0000
3+++ src/remotelinux/abstractremotelinuxrunconfiguration.h 2014-04-15 08:32:30 +0000
4@@ -53,12 +53,7 @@
5 virtual QString remoteExecutableFilePath() const = 0;
6 virtual QStringList arguments() const = 0;
7 virtual QString workingDirectory() const = 0;
8- virtual QString alternateRemoteExecutable() const = 0;
9- virtual bool useAlternateExecutable() const = 0;
10 virtual Utils::Environment environment() const = 0;
11-signals:
12- void deploySpecsChanged();
13- void targetInformationChanged() const;
14
15 protected:
16 AbstractRemoteLinuxRunConfiguration(ProjectExplorer::Target *parent,
17
18=== modified file 'src/remotelinux/remotelinuxrunconfiguration.h'
19--- src/remotelinux/remotelinuxrunconfiguration.h 2014-03-20 13:39:22 +0000
20+++ src/remotelinux/remotelinuxrunconfiguration.h 2014-04-15 08:32:30 +0000
21@@ -90,6 +90,10 @@
22
23 static const char *IdPrefix;
24
25+signals:
26+ void deploySpecsChanged();
27+ void targetInformationChanged() const;
28+
29 protected:
30 RemoteLinuxRunConfiguration(ProjectExplorer::Target *parent,
31 RemoteLinuxRunConfiguration *source);

Subscribers

People subscribed via source and target branches