Merge remote-tracking branch 'origin/13.0'

 Conflicts:
	doc/qtcreator/src/overview/creator-only/creator-reference.qdoc
	doc/qtcreator/src/qtcreator-toc.qdoc

Change-Id: Ibea5488fda972321c448c64fad7f657e84d62cdb

1 files changed, 5 insertions, 3 deletions

diff --git a/src/plugins/texteditor/codestyleselectorwidget.cpp b/src/plugins/texteditor/codestyleselectorwidget.cpp
index ddeea0a74e..5eb373f00f 100644
--- a/src/plugins/texteditor/codestyleselectorwidget.cpp
+++ b/src/plugins/texteditor/codestyleselectorwidget.cpp
@@ -216,9 +216,11 @@ void CodeStyleSelectorWidget::slotImportClicked()
 void CodeStyleSelectorWidget::slotExportClicked()
 {
     ICodeStylePreferences *currentPreferences = m_codeStyle->currentPreferences();
-    const FilePath filePath = FileUtils::getSaveFilePath(this, Tr::tr("Export Code Style"),
-                             FilePath::fromString(QString::fromUtf8(currentPreferences->id() + ".xml")),
-                             Tr::tr("Code styles (*.xml);;All files (*)"));
+    const FilePath filePath = FileUtils::getSaveFilePath(
+        this,
+        Tr::tr("Export Code Style"),
+        FileUtils::homePath().pathAppended(QString::fromUtf8(currentPreferences->id() + ".xml")),
+        Tr::tr("Code styles (*.xml);;All files (*)"));
     if (!filePath.isEmpty()) {
         CodeStylePool *codeStylePool = m_codeStyle->delegatingPool();
         codeStylePool->exportCodeStyle(filePath, currentPreferences);