Merge remote-tracking branch 'origin/4.10'

Conflicts:
	src/libs/utils/consoleprocess_win.cpp

Change-Id: Ibdc265eed2f7080726e11ff6f2931c8559943af2

src/plugins/diffeditor/diffeditorcontroller.cpp

@@ -55,6 +55,11 @@ QString DiffEditorController::baseDirectory() const
     return m_document->baseDirectory();
 }
 
+void DiffEditorController::setBaseDirectory(const QString &directory)
+{
+    m_document->setBaseDirectory(directory);
+}
+
 int DiffEditorController::contextLineCount() const
 {
     return m_document->contextLineCount();

src/plugins/diffeditor/diffeditorcontroller.h

@@ -48,6 +48,7 @@ public:
     bool isReloading() const;
 
     QString baseDirectory() const;
+    void setBaseDirectory(const QString &directory);
     int contextLineCount() const;
     bool ignoreWhitespace() const;
 

src/plugins/diffeditor/diffeditordocument.cpp

@@ -113,7 +113,8 @@ void DiffEditorDocument::setDiffFiles(const QList<FileData> &data, const QString
                                       const QString &startupFile)
 {
     m_diffFiles = data;
-    m_baseDirectory = directory;
+    if (!directory.isEmpty())
+        m_baseDirectory = directory;
     m_startupFile = startupFile;
     emit documentChanged();
 }
@@ -128,6 +129,11 @@ QString DiffEditorDocument::baseDirectory() const
     return m_baseDirectory;
 }
 
+void DiffEditorDocument::setBaseDirectory(const QString &directory)
+{
+    m_baseDirectory = directory;
+}
+
 QString DiffEditorDocument::startupFile() const
 {
     return m_startupFile;

src/plugins/diffeditor/diffeditordocument.h

@@ -60,6 +60,7 @@ public:
                       const QString &startupFile = QString());
     QList<FileData> diffFiles() const;
     QString baseDirectory() const;
+    void setBaseDirectory(const QString &directory);
     QString startupFile() const;
 
     void setDescription(const QString &description);