diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-08-22 09:53:37 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2019-08-22 09:53:37 +0200 |
| commit | 30143478f3a15c0e6d9a731730b66d78f1ae334a (patch) | |
| tree | 1178feb634379c1bf705e6ad8d778539618647c3 /src/plugins/vcsbase | |
| parent | d0bdfad93284ec8de3026d21ae3d845318e317fc (diff) | |
| parent | 8cd7a119262c226e575c0beda45a1af71a32baf5 (diff) | |
Merge remote-tracking branch 'origin/4.10'
Conflicts:
src/libs/utils/consoleprocess_win.cpp
Change-Id: Ibdc265eed2f7080726e11ff6f2931c8559943af2
Diffstat (limited to 'src/plugins/vcsbase')
| -rw-r--r-- | src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp index b2d989d7812..30946aee132 100644 --- a/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp +++ b/src/plugins/vcsbase/vcsbasediffeditorcontroller.cpp @@ -236,6 +236,7 @@ VcsBaseDiffEditorController::VcsBaseDiffEditorController(IDocument *document, : DiffEditorController(document) , d(new VcsBaseDiffEditorControllerPrivate(this, client, workingDirectory)) { + setBaseDirectory(workingDirectory); } VcsBaseDiffEditorController::~VcsBaseDiffEditorController() |