More Nokia -> Digia/QtProject changes

Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

9 files changed, 13 insertions, 13 deletions

diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index 311cd56ff5..0fc3d73afe 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 3fa493e7de..5af23b7e4e 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 7eb44776a4..b82c68f5a6 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 4394b933a2..b2d95f31bb 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 fc9ab92307..b29ed86e4a 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 f7cf04111d..00ce280da2 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 6ae6dc9cc4..6986ed70a7 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 70c608f415..db43debdae 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 ef70530633..9ad6548669 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