diff --git a/.gitignore b/.gitignore
index 0cffccfa8b149cc7c24318fb1c9eac88ef550b29..97d419babbfc733606486876ffc7f4c5ab456333 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,8 +89,8 @@ dist/gdb/staging
ipch
tmp
# ignore both a directory as well as a symlink
-share/qtcreator/Nokia/
-share/qtcreator/Nokia
+share/qtcreator/QtProject/
+share/qtcreator/QtProject
# Binaries
# --------
diff --git a/dist/known-issues b/dist/known-issues
index 209f1625181da9a445be992e3517216893b8c211..39b5b830118e1b5ae63c016dc732af4c8bb950ad 100644
--- a/dist/known-issues
+++ b/dist/known-issues
@@ -1,6 +1,6 @@
The Qt Creator Manual lists known issues in Qt Creator:
-http://doc.qt.nokia.com/qtcreator-snapshot/creator-known-issues.html
+http://doc.qt.digia.com/qtcreator-snapshot/creator-known-issues.html
For a complete list of reported issues, see the Qt Bug Tracker:
diff --git a/doc/api/examples/exampleplugin/example.pro b/doc/api/examples/exampleplugin/example.pro
index 060aa5aa8fabab6b8d86a990f4dfe8f9301d5624..b427449677941e67c9e91f7f2a7f39951e931f2a 100644
--- a/doc/api/examples/exampleplugin/example.pro
+++ b/doc/api/examples/exampleplugin/example.pro
@@ -31,9 +31,9 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=/Users/example/qtcreator-build
## uncomment to build plugin into user config directory
## <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
-## "~/Library/Application Support/Nokia/Qt Creator" on Mac
+## "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later
+## "$XDG_DATA_HOME/QtProject/qtcreator" or "~/.local/share/QtProject/qtcreator" on Linux
+## "~/Library/Application Support/QtProject/Qt Creator" on Mac
# USE_USER_DESTDIR = yes
#! [4]
@@ -45,6 +45,6 @@ PROVIDER = MyCompany
include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri)
include($$QTCREATOR_SOURCES/src/plugins/coreplugin/coreplugin.pri)
-LIBS += -L$$IDE_PLUGIN_PATH/Nokia
+LIBS += -L$$IDE_PLUGIN_PATH/QtProject
#![6]
diff --git a/doc/api/qtcreator-documentation.qdoc b/doc/api/qtcreator-documentation.qdoc
index 4f28c3ec2e69415cd0efe8ff74d2eee39602d1b7..103fc6be54f4f418b121ebd898d10ff8fa70d078 100644
--- a/doc/api/qtcreator-documentation.qdoc
+++ b/doc/api/qtcreator-documentation.qdoc
@@ -63,7 +63,7 @@
\section1 Configuring the Documentation Project
\QC documentation is written by using QDoc. For more information about using
- QDoc, see \l{http://doc.qt.nokia.com/qdoc/}{QDoc Reference Documentation}.
+ QDoc, see \l{http://qt-project.org/doc/qdoc/}{QDoc Reference Documentation}.
QDoc finds the new topics automatically, when you place them as .qdoc files
in the correct folder. However, to make the topics accessible to readers,
@@ -132,7 +132,7 @@
\section1 Writing Text
Follow the guidelines for
- \l{http://developer.qt.nokia.com/wiki/Writing_Qt_Documentation}
+ \l{http://qt-project.org/wiki/Writing_Qt_Documentation}
{writing Qt documentation}.
The documentation must be grammatically correct English and use the standard
diff --git a/doc/config/qt-html-templates-online.qdocconf b/doc/config/qt-html-templates-online.qdocconf
index 4e5732b9d75183d8f3d20ed0cea74623e22a8f2f..6eb54a94e0132cbf5e226eda5d0cab5d5072e953 100644
--- a/doc/config/qt-html-templates-online.qdocconf
+++ b/doc/config/qt-html-templates-online.qdocconf
@@ -9,12 +9,12 @@ HTML.postheader = \
" <div id=\"narrowsearch\"></div>\n" \
" <div id=\"nav-topright\">\n" \
" <ul>\n" \
- " <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
- " <li class=\"nav-topright-dev\"><a href=\"http://qt-project.org/\">DEV</a></li>\n" \
- " <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
+ " <li class=\"nav-topright-home\"><a href=\"http://qt-project.org/\">Qt HOME</a></li>\n" \
+ " <li class=\"nav-topright-dev\"><a href=\"http://wiki.qt-project.org/\">DEV</a></li>\n" \
+ " <li class=\"nav-topright-labs\"><a href=\"http://planet.qt-project.org/\">DEV BLOGS</a></li>\n" \
" <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://qt-project.org/doc/\">\n" \
" DOC</a></li>\n" \
- " <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
+ " <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.digia.com/\">BLOG</a></li>\n" \
" </ul>\n" \
" </div>\n" \
" <div id=\"shortCut\">\n" \
diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc
index 99b664e94ffcb7b8cb85271385461fb437298e32..42f2ccd6c713a08c0d2bae12b3888676d9bbc70a 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 786f1e01f2be6db0d89c1792093608ed323f6ec9..cf217ae9b618939ab3b8c28550742f2df3f8b648 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 37f73c7e90d8f91db2e065db3b76de84735430dd..f4e6da126a72666ae904a3636fcdaa185ed19969 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 93f7dc3e6ce95891fc7a27dbcd97a9c85c7ce477..fe96bdce8603bd9f85c1d35a859c40c52a353b69 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 0601de7efd074b01720d7043cc9aef0e6e12aa92..0ca18778d3a0792245c7ab1dfd9835dd3272415c 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 c794257a83530e748cad88572065de0b1c32a22b..e0557d74289c1f9e381b4b32dd8baa9401e954da 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 a74cfe02831acc477cf5b878d0aa5cccc3268792..aeff92101bf8c358d4127653147d86bcc50ffd83 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 c4e9d2b8f9608f873dd0ae9411187cab3b8e195d..215a50f40ffcbd24adfe86f9b4aedd7d049b5feb 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 fb0f73b0c732c873539ca906ef3d8ce8bfc25a7c..2ab040b19f42d6b8511c351d7d4fdef140bbff67 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 0c793cc799dc54997590c0814107bb252dd500c0..29b264612717818ce89f8699ab625b41e3f92cfb 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 967573230b6b0e737942df008921c91badb5e2e7..e8eefb33d49be3bc56b7d6d5c7d45072de2fe998 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 7a96271c6264e8c0d77a4281b64ea067d8518e23..c778848b5171796c768efe8af90d258a4b6eeafa 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 ff43970e714df16c13a75c9560dcda8370a3b9ab..835399d99a9efb2297bb43f7cfe44cf5d37454a3 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
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index 311cd56ff533c19002723c8592d7f35349d1d876..0fc3d73afe37e4a51235f4018f36f20e2b1a76ee 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -4,5 +4,5 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/3rdparty/cplusplus
include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
include($$IDE_SOURCE_TREE/src/rpath.pri)
-LIBS += -L$$IDE_PLUGIN_PATH/Nokia
-DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/Nokia\\\"\"
+LIBS += -L$$IDE_PLUGIN_PATH/QtProject
+DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/QtProject\\\"\"
diff --git a/tests/auto/externaltool/externaltool.pro b/tests/auto/externaltool/externaltool.pro
index 3fa493e7de49e335bc9c27404863498c9db8b690..5af23b7e4e96cdbc48328a5ff4a9f186ff534a64 100644
--- a/tests/auto/externaltool/externaltool.pro
+++ b/tests/auto/externaltool/externaltool.pro
@@ -1,7 +1,7 @@
IDE_BUILD_TREE = $$OUT_PWD/../../../
include(../qttest.pri)
include(../../../src/plugins/coreplugin/coreplugin.pri)
-LIBS *= -L$$IDE_PLUGIN_PATH/Nokia
+LIBS *= -L$$IDE_PLUGIN_PATH/QtProject
INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins/coreplugin
INCLUDEPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin
diff --git a/tests/auto/qml/qmldesigner/coretests/coretests.pro b/tests/auto/qml/qmldesigner/coretests/coretests.pro
index 7eb44776a4fd5cd88da0c1e55ddf742df9054e53..b82c68f5a6ce62bdccbf4a309a91bdd8b9469885 100644
--- a/tests/auto/qml/qmldesigner/coretests/coretests.pro
+++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro
@@ -9,9 +9,9 @@ OUT_PWD=QTCREATOR_BUILD
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
OUT_PWD=$$OUT_PWD_SAVE
-LIBS += -L$$IDE_PLUGIN_PATH/Nokia
+LIBS += -L$$IDE_PLUGIN_PATH/QtProject
-unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}/Nokia\'
+unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}/QtProject\'
QT += script \
network \
diff --git a/tests/auto/qttest.pri b/tests/auto/qttest.pri
index 4394b933a22b6128c84c10a44690ffd2e9838c46..b2d95f31bb90ae8d2dde3ed82efe745155afd618 100644
--- a/tests/auto/qttest.pri
+++ b/tests/auto/qttest.pri
@@ -9,7 +9,7 @@ CONFIG -= app_bundle
!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
win32 {
- lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH/Nokia
+ lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH/QtProject
lib ~= s,/,\\,g
# the below gets added to later by testcase.prf
check.commands = cd . & set PATH=$$lib;%PATH%& cmd /c
diff --git a/tests/auto/qttestrpath.pri b/tests/auto/qttestrpath.pri
index fc9ab923079e59f41d668ef4e31a17db7ab33779..b29ed86e4a3027be2c745dda3307f2fd4b871de3 100644
--- a/tests/auto/qttestrpath.pri
+++ b/tests/auto/qttestrpath.pri
@@ -1,6 +1,6 @@
linux-* {
QMAKE_RPATHDIR += $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
- QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH/Nokia
+ QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH/QtProject
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp
index f7cf04111d9253c698637551427661416d08bd57..00ce280da28175ebad454c7f00fa8d7bc3a24b37 100644
--- a/tests/manual/debugger/simple/simple_test_app.cpp
+++ b/tests/manual/debugger/simple/simple_test_app.cpp
@@ -3592,9 +3592,9 @@ namespace qurl {
void testQUrl()
{
- QUrl url(QString("http://www.nokia.com"));
+ QUrl url(QString("http://qt-project.org"));
BREAK_HERE;
- // Check url "http://www.nokia.com" QUrl.
+ // Check url "http://qt-project.org" QUrl.
// Continue.
dummyStatement(&url);
}
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index 6ae6dc9cc4eb4eb872eb7007ef3566aac5ef12ad..6986ed70a702a2c86f126d50cc1e68eccd649283 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -69,7 +69,7 @@ def __removeTmpSettingsDir__():
deleteDirIfExists(os.path.dirname(os.path.dirname(tmpSettingsDir)))
def substituteTildeWithinToolchains(settingsDir):
- toolchains = os.path.join(settingsDir, "Nokia", 'qtcreator', 'toolchains.xml')
+ toolchains = os.path.join(settingsDir, "QtProject", 'qtcreator', 'toolchains.xml')
origToolchains = toolchains + "_orig"
home = os.path.expanduser("~")
os.rename(toolchains, origToolchains)
@@ -118,7 +118,7 @@ def substituteUnchosenTargetABIs(settingsDir):
CLOSED = 2
on64Bit = __is64BitOS__()
- toolchains = os.path.join(settingsDir, "Nokia", 'qtcreator', 'toolchains.xml')
+ toolchains = os.path.join(settingsDir, "QtProject", 'qtcreator', 'toolchains.xml')
origToolchains = toolchains + "_orig"
os.rename(toolchains, origToolchains)
origFile = open(origToolchains, "r")
diff --git a/tests/valgrind/README b/tests/valgrind/README
index 70c608f4158d10c6040df6d444baffafa18d3858..db43debdae7425ff2794ff3e66ae53ef990e01a4 100644
--- a/tests/valgrind/README
+++ b/tests/valgrind/README
@@ -8,7 +8,7 @@ mkdir valgrind-test
cd valgrind-test
# make library paths known to ldconfig
-export LD_LIBRARY_PATH=/path/to/qtc-build/lib/qtcreator:/path/to/qtc-build/lib/qtcreator/plugins/Nokia
+export LD_LIBRARY_PATH=/path/to/qtc-build/lib/qtcreator:/path/to/qtc-build/lib/qtcreator/plugins/QtProject
# run qmake, make
qmake CONFIG+=debug IDE_BUILD_TREE=$(readlink -f ..) ../../path/to/qtc/tests/valgrind
diff --git a/tests/valgrind/callgrind/modeltest.pro b/tests/valgrind/callgrind/modeltest.pro
index ef70530633aaee21cfc75c402ae9d614d202c854..9ad6548669eb69eaad57409eb80f1c8e4768922e 100644
--- a/tests/valgrind/callgrind/modeltest.pro
+++ b/tests/valgrind/callgrind/modeltest.pro
@@ -29,7 +29,7 @@ HEADERS += \
$$SRCDIR/plugins/valgrind/callgrindwidgethandler.h \
$$SRCDIR/plugins/valgrind/callgrindvisualisation.h \
-LIBS += -L$$IDE_PLUGIN_PATH/Nokia
+LIBS += -L$$IDE_PLUGIN_PATH/QtProject
INCLUDEPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin # for ide_version.h