diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-03-01 12:20:57 +0200 |
---|---|---|
committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2019-03-01 13:06:57 +0200 |
commit | cbfc6e522dced7516dbfa036197476796ca1dcf8 (patch) | |
tree | e78aa7f496b1986d127e991da685bcc3382fa1f9 /src/plugins/vcsbase | |
parent | 89831854059144613279affc4c37eb65dbcbf6e7 (diff) | |
parent | aa14e396f03232ce97a723aaf18ab89f7dfad698 (diff) | |
download | qt-creator-cbfc6e522dced7516dbfa036197476796ca1dcf8.tar.gz |
Merge remote-tracking branch 'origin/4.9'
Change-Id: I801042a53ae4d02d1891ea582ca9ea89b00d3181
Diffstat (limited to 'src/plugins/vcsbase')
-rw-r--r-- | src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp | 7 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbasediffeditorcontroller.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp index 6ece9c8b9d..cb41e7e7d2 100644 --- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp +++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp @@ -98,6 +98,7 @@ public: const QString m_directory; QString m_startupFile; QString m_output; + QString m_displayName; QPointer<VcsCommand> m_command; QPointer<VcsCommandResultProxy> m_commandResultProxy; QFutureWatcher<QList<FileData>> *m_processWatcher = nullptr; @@ -251,6 +252,7 @@ void VcsBaseDiffEditorController::runCommand(const QList<QStringList> &args, uns d->cancelReload(); d->m_command = new VcsCommand(workingDirectory(), d->m_client->processEnvironment()); + d->m_command->setDisplayName(d->m_displayName); d->m_command->setCodec(codec ? codec : EditorManager::defaultTextCodec()); d->m_commandResultProxy = new VcsCommandResultProxy(d->m_command.data(), d); d->m_command->addFlags(flags); @@ -289,6 +291,11 @@ QString VcsBaseDiffEditorController::startupFile() const return d->m_startupFile; } +void VcsBaseDiffEditorController::setDisplayName(const QString &displayName) +{ + d->m_displayName = displayName; +} + } // namespace VcsBase #include "vcsbasediffeditorcontroller.moc" diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h index eb6e97157f..8b4668dbf0 100644 --- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.h +++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.h @@ -53,6 +53,7 @@ protected: QString workingDirectory() const; void setStartupFile(const QString &startupFile); QString startupFile() const; + void setDisplayName(const QString &displayName); private: friend class VcsBaseDiffEditorControllerPrivate; |