diff options
41 files changed, 60 insertions, 60 deletions
diff --git a/.gitignore b/.gitignore index 0cffccfa8b..97d419babb 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 209f162518..39b5b83011 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 060aa5aa8f..b427449677 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 4f28c3ec2e..103fc6be54 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 4e5732b9d7..6eb54a94e0 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 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 diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 4dad78b184..7c6032cc0e 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -109,7 +109,7 @@ const char REMOVE_CURRENT_SPLIT[] = "QtCreator.RemoveCurrentSplit"; const char REMOVE_ALL_SPLITS[] = "QtCreator.RemoveAllSplits"; const char GOTO_OTHER_SPLIT[] = "QtCreator.GotoOtherSplit"; const char CLOSE[] = "QtCreator.Close"; -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN const char CLOSE_ALTERNATIVE[] = "QtCreator.Close_Alternative"; // temporary, see QTCREATORBUG-72 #endif const char CLOSEALL[] = "QtCreator.CloseAll"; diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp index f84b38f715..3cf4471853 100644 --- a/src/plugins/coreplugin/editormanager/editormanager.cpp +++ b/src/plugins/coreplugin/editormanager/editormanager.cpp @@ -313,7 +313,7 @@ EditorManager::EditorManager(QWidget *parent) : mfile->addAction(cmd, Constants::G_FILE_CLOSE); connect(d->m_closeCurrentEditorAction, SIGNAL(triggered()), this, SLOT(closeEditor())); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN // workaround for QTCREATORBUG-72 QShortcut *sc = new QShortcut(parent); cmd = ActionManager::registerShortcut(sc, Constants::CLOSE_ALTERNATIVE, editManagerContext); diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index 3314e0b7a8..8885b0c187 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -2606,7 +2606,7 @@ QPoint BaseTextEditorWidget::toolTipPosition(const QTextCursor &c) const { const QPoint cursorPos = mapToGlobal(cursorRect(c).bottomRight() + QPoint(1,1)); return cursorPos + QPoint(d->m_extraArea->width(), -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN -24 #else -16 diff --git a/src/plugins/texteditor/tooltip/tooltip.cpp b/src/plugins/texteditor/tooltip/tooltip.cpp index 6ae7ad154c..7721155da2 100644 --- a/src/plugins/texteditor/tooltip/tooltip.cpp +++ b/src/plugins/texteditor/tooltip/tooltip.cpp @@ -67,7 +67,7 @@ ToolTip *ToolTip::instance() void ToolTip::show(const QPoint &pos, const TipContent &content, QWidget *w, const QRect &rect) { if (acceptShow(content, pos, w, rect)) { -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN m_tip = m_tipFactory->createTip(content, w); #else m_tip = m_tipFactory->createTip( @@ -205,7 +205,7 @@ void ToolTip::placeTip(const QPoint &pos, QWidget *w) QRect screen = Internal::screenGeometry(pos, w); QPoint p = pos; p += QPoint(2, -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN 21 #else 16 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 0c15be9520..cae3ae973b 100644 --- a/tests/auto/qml/qmldesigner/coretests/coretests.pro +++ b/tests/auto/qml/qmldesigner/coretests/coretests.pro @@ -6,10 +6,10 @@ OUT_PWD=IDE_BUILD_TREE include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri) include(../../../qttest.pri) OUT_PWD=$$OUT_PWD_SAVE -LIBS += -L$$IDE_PLUGIN_PATH/Nokia +LIBS += -L$$IDE_PLUGIN_PATH/QtProject LIBS += -L$$IDE_LIBRARY_PATH -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 fe994a927c..c18ed88a95 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/settings/unix/Nokia/QtCreator.ini b/tests/system/settings/unix/QtProject/QtCreator.ini index b77fccec03..b77fccec03 100644 --- a/tests/system/settings/unix/Nokia/QtCreator.ini +++ b/tests/system/settings/unix/QtProject/QtCreator.ini diff --git a/tests/system/settings/unix/Nokia/qtcreator/devices.xml b/tests/system/settings/unix/QtProject/qtcreator/devices.xml index fd4632d18e..fd4632d18e 100644 --- a/tests/system/settings/unix/Nokia/qtcreator/devices.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/devices.xml diff --git a/tests/system/settings/unix/Nokia/qtcreator/profiles.xml b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml index a58ef9831d..a58ef9831d 100644 --- a/tests/system/settings/unix/Nokia/qtcreator/profiles.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml diff --git a/tests/system/settings/unix/Nokia/qtcreator/qtversion.xml b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml index fed739fd8d..fed739fd8d 100644 --- a/tests/system/settings/unix/Nokia/qtcreator/qtversion.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml diff --git a/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml b/tests/system/settings/unix/QtProject/qtcreator/toolchains.xml index a2525c73ac..a2525c73ac 100644 --- a/tests/system/settings/unix/Nokia/qtcreator/toolchains.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/toolchains.xml diff --git a/tests/system/settings/windows/Nokia/QtCreator.ini b/tests/system/settings/windows/QtProject/QtCreator.ini index b77fccec03..b77fccec03 100644 --- a/tests/system/settings/windows/Nokia/QtCreator.ini +++ b/tests/system/settings/windows/QtProject/QtCreator.ini diff --git a/tests/system/settings/windows/Nokia/qtcreator/devices.xml b/tests/system/settings/windows/QtProject/qtcreator/devices.xml index 558af5ec9e..558af5ec9e 100644 --- a/tests/system/settings/windows/Nokia/qtcreator/devices.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/devices.xml diff --git a/tests/system/settings/windows/Nokia/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml index ef02ba7560..ef02ba7560 100644 --- a/tests/system/settings/windows/Nokia/qtcreator/profiles.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml diff --git a/tests/system/settings/windows/Nokia/qtcreator/qtversion.xml b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml index 83ca6e82cf..83ca6e82cf 100644 --- a/tests/system/settings/windows/Nokia/qtcreator/qtversion.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml diff --git a/tests/system/settings/windows/Nokia/qtcreator/toolchains.xml b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml index 27bae2abb8..27bae2abb8 100644 --- a/tests/system/settings/windows/Nokia/qtcreator/toolchains.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml 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 |