From 61082af6af37d34bbb210d5f28e47df2cf1714d0 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@nokia.com>
Date: Fri, 13 Jan 2012 11:03:29 +0100
Subject: [PATCH] Doc: Location where "local" data is saved (e.g. compiled
helpers).
Change-Id: I21ccfd58cbcaae6231b88d3a9039eb413f4be1c2
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
---
doc/src/howto/qtcreator-faq.qdoc | 27 ++++++++++++++-----
.../wizards/qtcreatorplugin/myplugin.pro | 2 +-
src/app/main.cpp | 2 +-
3 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc
index 7eff876ea1a..e34528f7188 100644
--- a/doc/src/howto/qtcreator-faq.qdoc
+++ b/doc/src/howto/qtcreator-faq.qdoc
@@ -37,7 +37,7 @@
\bold {How do I reset all \QC settings?}
- \QC creates the following files and a directories:
+ \QC creates the following files and directories:
\list
@@ -51,16 +51,29 @@
\o qtcreator
+ \o qtc-debugging-helper
+
+ \o qtc-qmldbg
+
+ \o qtc-qmldump
+
+ \o qtc-qmlobserver
+
\endlist
- The location depends on the platform. On Linux, Unix, and Mac OS, the files
- are located in \c{~/.config/Nokia}.
+ The location depends on the platform. On Linux and other Unix platforms, the files
+ are located in \c {~/.config/Nokia} and \c {~/.local/share/data/Nokia/qtcreator}.
+
+ On Mac OS, the files are located in \c {~/.config/Nokia} and
+ \c {~/Library/Application Support/Nokia/Qt Creator}.
On Windows XP, the files are located in
- \c{<drive>:\Documents and Settings\<username>\Application Data\Nokia}, and
- on Windows Vista and Windows 7 in
- \c {<drive>:\Users\<username>\AppData\Roaming\Nokia}.
- For all versions, try the path \c{APPDATA\Nokia}.
+ \c {<drive>:\Documents and Settings\<username>\Application Data\Nokia} and
+ \c {<drive>:\Documents and Settings\<username>\Local Settings\Application Data\Nokia}.
+
+ On Windows Vista and Windows 7, the files are located in
+ \c {<drive>:\Users\<username>\AppData\Roaming\Nokia} and
+ \c {<drive>:\Users\<username>\AppData\Local\Nokia}.
\bold {\QC comes with MinGW, should I use this version with Qt?}
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
index f3f19a66137..2304bc393dd 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
@@ -25,7 +25,7 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=%QtCreatorBuild%
## <localappdata>/plugins/<ideversion>
## where <localappdata> is e.g.
## "%LOCALAPPDATA%\Nokia\qtcreator" on Windows Vista and later
-## "$XDG_DATA_HOME/Nokia/qtcreator" or "~/.local/share/Nokia/qtcreator" on Linux
+## "$XDG_DATA_HOME/Nokia/qtcreator" or "~/.local/share/data/Nokia/qtcreator" on Linux
## "~/Library/Application Support/Nokia/Qt Creator" on Mac
%DestDir%USE_USER_DESTDIR = yes
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 5dfe3a748a1..8ccf1c120e1 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -178,7 +178,7 @@ static inline QStringList getPluginPaths()
// 3) <localappdata>/plugins/<ideversion>
// where <localappdata> is e.g.
// <drive>:\Users\<username>\AppData\Local\Nokia\qtcreator on Windows Vista and later
- // $XDG_DATA_HOME or ~/.local/share/Nokia/qtcreator on Linux
+ // $XDG_DATA_HOME or ~/.local/share/data/Nokia/qtcreator on Linux
// ~/Library/Application Support/Nokia/Qt Creator on Mac
pluginPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
pluginPath += QLatin1Char('/')
--
GitLab