aboutsummaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/debugger/creator-debugger-setup.qdoc2
-rw-r--r--doc/src/editors/creator-editors.qdoc4
-rw-r--r--doc/src/howto/creator-external-tools.qdoc4
-rw-r--r--doc/src/howto/creator-help.qdoc4
-rw-r--r--doc/src/howto/qtcreator-faq.qdoc16
-rw-r--r--doc/src/linux-mobile/creator-madde-emulator.qdoc2
-rw-r--r--doc/src/linux-mobile/maemodev.qdoc8
-rw-r--r--doc/src/linux-mobile/meegodev.qdoc6
-rw-r--r--doc/src/overview/creator-tech-support.qdoc2
-rw-r--r--doc/src/projects/creator-projects-building-running.qdoc2
-rw-r--r--doc/src/projects/creator-projects-custom-wizards.qdoc4
-rw-r--r--doc/src/projects/creator-projects-running-simulator.qdocinc2
-rw-r--r--doc/src/qnx/creator-deployment-qnx.qdoc2
13 files changed, 29 insertions, 29 deletions
diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc
index 99b664e94f..42f2ccd6c7 100644
--- a/doc/src/debugger/creator-debugger-setup.qdoc
+++ b/doc/src/debugger/creator-debugger-setup.qdoc
@@ -186,7 +186,7 @@
are installed when you install \QC and Qt SDK. On Mac OS X,
use the GDB provided with Xcode.
You can also build your own Python-enabled GDB. Follow the instructions in
- \l{http://developer.qt.nokia.com/wiki/QtCreatorBuildGdb}
+ \l{http://qt-project.org/wiki/QtCreatorBuildGdb}
{Building GDB}.
\row
diff --git a/doc/src/editors/creator-editors.qdoc b/doc/src/editors/creator-editors.qdoc
index 786f1e01f2..cf217ae9b6 100644
--- a/doc/src/editors/creator-editors.qdoc
+++ b/doc/src/editors/creator-editors.qdoc
@@ -187,9 +187,9 @@
The specification does not define how to map JSON instances with JSON
schemas. As a temporary solution, \QC looks for a JSON schema file with a
name that matches the name of the JSON instance file in the user
- configuration folder. For example, \c {~/config/Nokia/qtcreator/json} on
+ configuration folder. For example, \c {~/config/QtProject/qtcreator/json} on
Linux and Mac OS and
- \c {C:\Users\username\AppData\Roaming\Nokia\qtcreator\json}
+ \c {C:\Users\username\AppData\Roaming\QtCreator\qtcreator\json}
in Windows. To check JSON data structure, copy the JSON schema file to the
above folder.
diff --git a/doc/src/howto/creator-external-tools.qdoc b/doc/src/howto/creator-external-tools.qdoc
index 37f73c7e90..f4e6da126a 100644
--- a/doc/src/howto/creator-external-tools.qdoc
+++ b/doc/src/howto/creator-external-tools.qdoc
@@ -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.
diff --git a/doc/src/howto/creator-help.qdoc b/doc/src/howto/creator-help.qdoc
index 93f7dc3e6c..fe96bdce86 100644
--- a/doc/src/howto/creator-help.qdoc
+++ b/doc/src/howto/creator-help.qdoc
@@ -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
diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc
index 0601de7efd..0ca18778d3 100644
--- a/doc/src/howto/qtcreator-faq.qdoc
+++ b/doc/src/howto/qtcreator-faq.qdoc
@@ -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.
diff --git a/doc/src/linux-mobile/creator-madde-emulator.qdoc b/doc/src/linux-mobile/creator-madde-emulator.qdoc
index c794257a83..e0557d7428 100644
--- a/doc/src/linux-mobile/creator-madde-emulator.qdoc
+++ b/doc/src/linux-mobile/creator-madde-emulator.qdoc
@@ -46,7 +46,7 @@
To test the application UI, user interaction with the application, and
functionality that uses the mobility APIs, use \QS,
instead. For more information, see the
- \l{http://doc.qt.nokia.com/qtsimulator/index.html}{\QS Manual}.
+ \l{http://doc.qt.digia.com/qtsimulator/index.html}{\QS Manual}.
The difference between \QS and the emulators is that when you
compile your application binary for \QS, it is compiled against a
diff --git a/doc/src/linux-mobile/maemodev.qdoc b/doc/src/linux-mobile/maemodev.qdoc
index a74cfe0283..aeff92101b 100644
--- a/doc/src/linux-mobile/maemodev.qdoc
+++ b/doc/src/linux-mobile/maemodev.qdoc
@@ -45,7 +45,7 @@
For more information about developing applications for the Maemo 5
platform, select \gui {Help > Index} and look for \gui {Platform Notes},
or see
- \l{http://doc.qt.nokia.com/qt-maemo/platform-notes-maemo5.html}{Platform Notes - Maemo 5}.
+ \l{http://doc.qt.digia.com/qt-maemo/platform-notes-maemo5.html}{Platform Notes - Maemo 5}.
\section1 Hardware and Software Requirements for Maemo Devices
@@ -233,7 +233,7 @@
\if defined(qcmanual)
\l{Testing with User Data on Maemo Devices}.
\else
- \l{http://doc.qt.nokia.com/qtcreator/creator-developing-maemo.html#testing-with-user-data-on-maemo-devices}
+ \l{http://doc.qt.digia.com/qtcreator/creator-developing-maemo.html#testing-with-user-data-on-maemo-devices}
{Testing with User Data on Maemo Devices}.
\endif
@@ -249,7 +249,7 @@
\if defined(qcmanual)
\l{Generating SSH Keys}.
\else
- \l{http://doc.qt.nokia.com/qtcreator/creator-developing-meego.html#generating-ssh-keys}
+ \l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#generating-ssh-keys}
{Generating SSH Keys}.
\endif
@@ -259,7 +259,7 @@
\if defined(qcmanual)
\l{Managing Device Processes}.
\else
- \l{http://doc.qt.nokia.com/qtcreator/creator-developing-meego.html#managing-device-processes}
+ \l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#managing-device-processes}
{Managing Device Processes}.
\endif
diff --git a/doc/src/linux-mobile/meegodev.qdoc b/doc/src/linux-mobile/meegodev.qdoc
index c4e9d2b8f9..215a50f40f 100644
--- a/doc/src/linux-mobile/meegodev.qdoc
+++ b/doc/src/linux-mobile/meegodev.qdoc
@@ -246,7 +246,7 @@
\if defined(qcmanual)
\l{Testing with User Data on MeeGo Devices}.
\else
- \l{http://doc.qt.nokia.com/qtcreator/creator-developing-meego.html#testing-with-user-data-on-meego-devices}
+ \l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#testing-with-user-data-on-meego-devices}
{Testing with User Data on MeeGo Devices}.
\endif
@@ -261,7 +261,7 @@
\if defined(qcmanual)
\l{Generating SSH Keys}.
\else
- \l{http://doc.qt.nokia.com/qtcreator/creator-developing-meego.html#generating-ssh-keys}
+ \l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#generating-ssh-keys}
{Generating SSH Keys}.
\endif
@@ -271,7 +271,7 @@
\if defined(qcmanual)
\l{Managing Device Processes}.
\else
- \l{http://doc.qt.nokia.com/qtcreator/creator-developing-meego.html#managing-device-processes}
+ \l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#managing-device-processes}
{Managing Device Processes}.
\endif
diff --git a/doc/src/overview/creator-tech-support.qdoc b/doc/src/overview/creator-tech-support.qdoc
index fb0f73b0c7..2ab040b19f 100644
--- a/doc/src/overview/creator-tech-support.qdoc
+++ b/doc/src/overview/creator-tech-support.qdoc
@@ -46,7 +46,7 @@
\row
\o Develop Qt applications for desktop and mobile devices
- \o \l{http://developer.qt.nokia.com/}{Qt Developer Network}
+ \o \l{http://qt-project.org}{Qt Developer Network}
\row
\o Develop Qt applications for Nokia mobile devices
diff --git a/doc/src/projects/creator-projects-building-running.qdoc b/doc/src/projects/creator-projects-building-running.qdoc
index 0c793cc799..29b2646127 100644
--- a/doc/src/projects/creator-projects-building-running.qdoc
+++ b/doc/src/projects/creator-projects-building-running.qdoc
@@ -82,7 +82,7 @@
a location from where it can be run on the device. You can change
the relationship between the build, run, and deploy configurations.
- \o \l{http://doc.qt.nokia.com/qtsimulator/index.html}
+ \o \l{http://doc.qt.digia.com/qtsimulator/index.html}
{Using Qt Simulator}
You can use the \QS to test Qt applications that are
diff --git a/doc/src/projects/creator-projects-custom-wizards.qdoc b/doc/src/projects/creator-projects-custom-wizards.qdoc
index 967573230b..e8eefb33d4 100644
--- a/doc/src/projects/creator-projects-custom-wizards.qdoc
+++ b/doc/src/projects/creator-projects-custom-wizards.qdoc
@@ -87,9 +87,9 @@
\o \c{share/qtcreator/templates/wizards}
\o the local user's configuration folder,
- \c{$HOME/.config/Nokia/qtcreator/templates/wizards}
+ \c{$HOME/.config/QtProject/qtcreator/templates/wizards}
- \o \c{%APPDATA%\Nokia\qtcreator\templates\wizards}
+ \o \c{%APPDATA%\QtProject\qtcreator\templates\wizards}
\endlist
diff --git a/doc/src/projects/creator-projects-running-simulator.qdocinc b/doc/src/projects/creator-projects-running-simulator.qdocinc
index 7a96271c62..c778848b51 100644
--- a/doc/src/projects/creator-projects-running-simulator.qdocinc
+++ b/doc/src/projects/creator-projects-running-simulator.qdocinc
@@ -14,4 +14,4 @@
\endlist
For more information about using the \QS, see the
- \l{http://doc.qt.nokia.com/qtsimulator/index.html}{\QS Manual}.
+ \l{http://doc.qt.digia.com/qtsimulator/index.html}{\QS Manual}.
diff --git a/doc/src/qnx/creator-deployment-qnx.qdoc b/doc/src/qnx/creator-deployment-qnx.qdoc
index ff43970e71..835399d99a 100644
--- a/doc/src/qnx/creator-deployment-qnx.qdoc
+++ b/doc/src/qnx/creator-deployment-qnx.qdoc
@@ -73,7 +73,7 @@
\gui {Remote Directory} field displays the folder where the file is
installed on the device. Text in red color indicates that the information is
missing. Edit the qmake
- \l{http://doc.qt.nokia.com/4.8/qmake-variable-reference.html#installs}
+ \l{http://qt-project.org/doc/qt-4.8/qmake-variable-reference.html#installs}
{INSTALLS variable} in the project .pro file to add the missing files.
When you run the application, \QC copies the necessary files to the device
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 13:49:59 +0000