feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.6'

Browse Source 
Conflicts:
	src/plugins/coreplugin/fileiconprovider.cpp
	src/plugins/cppeditor/cppplugin.cpp
	tests/auto/qml/qmldesigner/coretests/coretests.pro

Change-Id: I0e83becf661ded9316ce6766786c9ef4c2f897a7
This commit is contained in:
Eike Ziller
2012-10-09 14:27:29 +02:00
parent 8bed5c33f9 996479e64f
commit 086dd684ab
41 changed files with 60 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
doc/src/howto/creator-external-tools.qdoc
View File

@@ -139,9 +139,9 @@
The tool configurations that you add and modify are stored in XML format in
the user configuration folder. For example,
\c {~/config/Nokia/qtcreator/externaltools}
\c {~/config/QtProject/qtcreator/externaltools}
on Linux and Mac OS and
\c {C:\Users\username\AppData\Roaming\Nokia\qtcreator\externaltools}
\c {C:\Users\username\AppData\Roaming\QtProject\qtcreator\externaltools}
in Windows. To share a configuration with other users, copy an XML
configuration file to the folder.

4
doc/src/howto/creator-help.qdoc
View File

@@ -158,8 +158,8 @@
If you cannot find words that you know are there, indexing might not have
been completed for some reason. Remove the \c {.helpcollection} folder and
open the \gui Search pane again to recreate the index. The folder is located
in \c { ~/.config/Nokia/qtcreator/.helpcollection} on Linux and Mac OS X and
in \c {\AppData\Roaming\Nokia\qtcreator\} on Windows.
in \c { ~/.config/QtProject/qtcreator/.helpcollection} on Linux and Mac OS X and
in \c {\AppData\Roaming\QtProject\qtcreator\} on Windows.
Punctuation is not included in indexed terms. To find terms that contain
punctuation, such as domain names, use the asterisk as a wild card. For

16
doc/src/howto/qtcreator-faq.qdoc
View File

@@ -59,18 +59,18 @@
\endlist
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}.
are located in \c {~/.config/QtProject} and \c {~/.local/share/data/QtProject/qtcreator}.
On Mac OS, the files are located in \c {~/.config/Nokia} and
\c {~/Library/Application Support/Nokia/Qt Creator}.
On Mac OS, the files are located in \c {~/.config/QtProject} and
\c {~/Library/Application Support/QtProject/Qt Creator}.
On Windows XP, the files are located in
\c {<drive>:\Documents and Settings\<username>\Application Data\Nokia} and
\c {<drive>:\Documents and Settings\<username>\Local Settings\Application Data\Nokia}.
\c {<drive>:\Documents and Settings\<username>\Application Data\QtProject} and
\c {<drive>:\Documents and Settings\<username>\Local Settings\Application Data\QtProject}.
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}.
\c {<drive>:\Users\<username>\AppData\Roaming\QtProject} and
\c {<drive>:\Users\<username>\AppData\Local\QtProject}.
\bold {\QC comes with MinGW, should I use this version with Qt?}
@@ -130,7 +130,7 @@
installed when you install \QC and Qt SDK. On Mac OS X, use the GDB
provided with Xcode. For a custom target, you can build your own
Python-enabled GDB. Follow the instructions in
\l{http://developer.qt.nokia.com/wiki/QtCreatorBuildGdb}{Building GDB}.
\l{http://qt-project.org/wiki/QtCreatorBuildGdb}{Building GDB}.
You must use at least Python version 2.5, but we recommend that you use
version 2.6.