Merge remote-tracking branch 'origin/4.0'

Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb
This commit is contained in:
Eike Ziller
2016-04-15 10:07:49 +02:00
193 changed files with 966 additions and 1553 deletions

View File

@@ -56,6 +56,7 @@ public:
StopResult stop() override; // Called from SnapshotWindow.
bool isRunning() const override;
QString displayName() const override;
bool supportsReRunning() const override;
void startFailed();
void notifyEngineRemoteServerRunning(const QByteArray &msg, int pid);