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

More Nokia -> Digia/QtProject changes

Browse Source 
Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Eike Ziller
2012-10-09 12:21:04 +02:00
committed by Tobias Hunger
parent 2b56943a8e
commit 1504ca67fb
27 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -89,8 +89,8 @@ dist/gdb/staging
ipch ipch
tmp tmp
# ignore both a directory as well as a symlink # ignore both a directory as well as a symlink
share/qtcreator/Nokia/ share/qtcreator/QtProject/
share/qtcreator/Nokia share/qtcreator/QtProject
# Binaries # Binaries
# -------- # --------

2
dist/known-issues vendored
View File

@@ -1,6 +1,6 @@
The Qt Creator Manual lists known issues in Qt Creator: 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: For a complete list of reported issues, see the Qt Bug Tracker:

8
doc/api/examples/exampleplugin/example.pro
View File

@@ -31,9 +31,9 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=/Users/example/qtcreator-build
## uncomment to build plugin into user config directory ## uncomment to build plugin into user config directory
## <localappdata>/plugins/<ideversion> ## <localappdata>/plugins/<ideversion>
## where <localappdata> is e.g. ## where <localappdata> is e.g.
## "%LOCALAPPDATA%\Nokia\qtcreator" on Windows Vista and later ## "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later
## "$XDG_DATA_HOME/Nokia/qtcreator" or "~/.local/share/Nokia/qtcreator" on Linux ## "$XDG_DATA_HOME/QtProject/qtcreator" or "~/.local/share/QtProject/qtcreator" on Linux
## "~/Library/Application Support/Nokia/Qt Creator" on Mac ## "~/Library/Application Support/QtProject/Qt Creator" on Mac
# USE_USER_DESTDIR = yes # USE_USER_DESTDIR = yes
#! [4] #! [4]
@@ -45,6 +45,6 @@ PROVIDER = MyCompany
include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri) include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri)
include($$QTCREATOR_SOURCES/src/plugins/coreplugin/coreplugin.pri) include($$QTCREATOR_SOURCES/src/plugins/coreplugin/coreplugin.pri)
LIBS += -L$$IDE_PLUGIN_PATH/Nokia LIBS += -L$$IDE_PLUGIN_PATH/QtProject
#![6] #![6]

4
doc/api/qtcreator-documentation.qdoc
View File

@@ -63,7 +63,7 @@
\section1 Configuring the Documentation Project \section1 Configuring the Documentation Project
\QC documentation is written by using QDoc. For more information about using \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 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, in the correct folder. However, to make the topics accessible to readers,
@@ -132,7 +132,7 @@
\section1 Writing Text \section1 Writing Text
Follow the guidelines for 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}. {writing Qt documentation}.
The documentation must be grammatically correct English and use the standard The documentation must be grammatically correct English and use the standard

8
doc/config/qt-html-templates-online.qdocconf
View File

@@ -9,12 +9,12 @@ HTML.postheader = \
" <div id=\"narrowsearch\"></div>\n" \ " <div id=\"narrowsearch\"></div>\n" \
" <div id=\"nav-topright\">\n" \ " <div id=\"nav-topright\">\n" \
" <ul>\n" \ " <ul>\n" \
" <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</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://qt-project.org/\">DEV</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://labs.qt.nokia.com/blogs/\">LABS</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" \ " <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://qt-project.org/doc/\">\n" \
" DOC</a></li>\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" \ " </ul>\n" \
" </div>\n" \ " </div>\n" \
" <div id=\"shortCut\">\n" \ " <div id=\"shortCut\">\n" \

2
doc/src/debugger/creator-debugger-setup.qdoc
View File

@@ -186,7 +186,7 @@
are installed when you install \QC and Qt SDK. On Mac OS X, are installed when you install \QC and Qt SDK. On Mac OS X,
use the GDB provided with Xcode. use the GDB provided with Xcode.
You can also build your own Python-enabled GDB. Follow the instructions in 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}. {Building GDB}.
\row \row

4
doc/src/editors/creator-editors.qdoc
View File

@@ -187,9 +187,9 @@
The specification does not define how to map JSON instances with JSON 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 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 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 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 in Windows. To check JSON data structure, copy the JSON schema file to the
above folder. above folder.

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 tool configurations that you add and modify are stored in XML format in
the user configuration folder. For example, the user configuration folder. For example,
\c {~/config/Nokia/qtcreator/externaltools} \c {~/config/QtProject/qtcreator/externaltools}
on Linux and Mac OS and 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 in Windows. To share a configuration with other users, copy an XML
configuration file to the folder. 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 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 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 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 { ~/.config/QtProject/qtcreator/.helpcollection} on Linux and Mac OS X and
in \c {\AppData\Roaming\Nokia\qtcreator\} on Windows. in \c {\AppData\Roaming\QtProject\qtcreator\} on Windows.
Punctuation is not included in indexed terms. To find terms that contain 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 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 \endlist
The location depends on the platform. On Linux and other Unix platforms, the files 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 On Mac OS, the files are located in \c {~/.config/QtProject} and
\c {~/Library/Application Support/Nokia/Qt Creator}. \c {~/Library/Application Support/QtProject/Qt Creator}.
On Windows XP, the files are located in On Windows XP, the files are located in
\c {<drive>:\Documents and Settings\<username>\Application Data\Nokia} and \c {<drive>:\Documents and Settings\<username>\Application Data\QtProject} and
\c {<drive>:\Documents and Settings\<username>\Local Settings\Application Data\Nokia}. \c {<drive>:\Documents and Settings\<username>\Local Settings\Application Data\QtProject}.
On Windows Vista and Windows 7, the files are located in On Windows Vista and Windows 7, the files are located in
\c {<drive>:\Users\<username>\AppData\Roaming\Nokia} and \c {<drive>:\Users\<username>\AppData\Roaming\QtProject} and
\c {<drive>:\Users\<username>\AppData\Local\Nokia}. \c {<drive>:\Users\<username>\AppData\Local\QtProject}.
\bold {\QC comes with MinGW, should I use this version with Qt?} \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 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 provided with Xcode. For a custom target, you can build your own
Python-enabled GDB. Follow the instructions in 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 You must use at least Python version 2.5, but we recommend that you use
version 2.6. version 2.6.

2
doc/src/linux-mobile/creator-madde-emulator.qdoc
View File

@@ -46,7 +46,7 @@
To test the application UI, user interaction with the application, and To test the application UI, user interaction with the application, and
functionality that uses the mobility APIs, use \QS, functionality that uses the mobility APIs, use \QS,
instead. For more information, see the 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 The difference between \QS and the emulators is that when you
compile your application binary for \QS, it is compiled against a compile your application binary for \QS, it is compiled against a

8
doc/src/linux-mobile/maemodev.qdoc
View File

@@ -45,7 +45,7 @@
For more information about developing applications for the Maemo 5 For more information about developing applications for the Maemo 5
platform, select \gui {Help > Index} and look for \gui {Platform Notes}, platform, select \gui {Help > Index} and look for \gui {Platform Notes},
or see 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 \section1 Hardware and Software Requirements for Maemo Devices
@@ -233,7 +233,7 @@
\if defined(qcmanual) \if defined(qcmanual)
\l{Testing with User Data on Maemo Devices}. \l{Testing with User Data on Maemo Devices}.
\else \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}. {Testing with User Data on Maemo Devices}.
\endif \endif
@@ -249,7 +249,7 @@
\if defined(qcmanual) \if defined(qcmanual)
\l{Generating SSH Keys}. \l{Generating SSH Keys}.
\else \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}. {Generating SSH Keys}.
\endif \endif
@@ -259,7 +259,7 @@
\if defined(qcmanual) \if defined(qcmanual)
\l{Managing Device Processes}. \l{Managing Device Processes}.
\else \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}. {Managing Device Processes}.
\endif \endif

6
doc/src/linux-mobile/meegodev.qdoc
View File

@@ -246,7 +246,7 @@
\if defined(qcmanual) \if defined(qcmanual)
\l{Testing with User Data on MeeGo Devices}. \l{Testing with User Data on MeeGo Devices}.
\else \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}. {Testing with User Data on MeeGo Devices}.
\endif \endif
@@ -261,7 +261,7 @@
\if defined(qcmanual) \if defined(qcmanual)
\l{Generating SSH Keys}. \l{Generating SSH Keys}.
\else \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}. {Generating SSH Keys}.
\endif \endif
@@ -271,7 +271,7 @@
\if defined(qcmanual) \if defined(qcmanual)
\l{Managing Device Processes}. \l{Managing Device Processes}.
\else \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}. {Managing Device Processes}.
\endif \endif

2
doc/src/overview/creator-tech-support.qdoc
View File

@@ -46,7 +46,7 @@
\row \row
\o Develop Qt applications for desktop and mobile devices \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 \row
\o Develop Qt applications for Nokia mobile devices \o Develop Qt applications for Nokia mobile devices

2
doc/src/projects/creator-projects-building-running.qdoc
View File

@@ -82,7 +82,7 @@
a location from where it can be run on the device. You can change a location from where it can be run on the device. You can change
the relationship between the build, run, and deploy configurations. 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} {Using Qt Simulator}
You can use the \QS to test Qt applications that are You can use the \QS to test Qt applications that are

4
doc/src/projects/creator-projects-custom-wizards.qdoc
View File

@@ -87,9 +87,9 @@
\o \c{share/qtcreator/templates/wizards} \o \c{share/qtcreator/templates/wizards}
\o the local user's configuration folder, \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 \endlist

2
doc/src/projects/creator-projects-running-simulator.qdocinc
View File

@@ -14,4 +14,4 @@
\endlist \endlist
For more information about using the \QS, see the 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}.

2
doc/src/qnx/creator-deployment-qnx.qdoc
View File

@@ -73,7 +73,7 @@
\gui {Remote Directory} field displays the folder where the file is \gui {Remote Directory} field displays the folder where the file is
installed on the device. Text in red color indicates that the information is installed on the device. Text in red color indicates that the information is
missing. Edit the qmake 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. {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 When you run the application, \QC copies the necessary files to the device

4
tests/auto/cplusplus/shared/shared.pri
View File

@@ -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/plugins/cpptools/cpptools.pri)
include($$IDE_SOURCE_TREE/src/rpath.pri) include($$IDE_SOURCE_TREE/src/rpath.pri)
LIBS += -L$$IDE_PLUGIN_PATH/Nokia LIBS += -L$$IDE_PLUGIN_PATH/QtProject
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/Nokia\\\"\" DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/QtProject\\\"\"

2
tests/auto/externaltool/externaltool.pro
View File

@@ -1,7 +1,7 @@
IDE_BUILD_TREE = $$OUT_PWD/../../../ IDE_BUILD_TREE = $$OUT_PWD/../../../
include(../qttest.pri) include(../qttest.pri)
include(../../../src/plugins/coreplugin/coreplugin.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_SOURCE_TREE/src/plugins/coreplugin
INCLUDEPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin INCLUDEPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin

4
tests/auto/qml/qmldesigner/coretests/coretests.pro
View File

@@ -9,9 +9,9 @@ OUT_PWD=QTCREATOR_BUILD
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri) include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
OUT_PWD=$$OUT_PWD_SAVE 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 \ QT += script \
network \ network \

2
tests/auto/qttest.pri
View File

@@ -9,7 +9,7 @@ CONFIG -= app_bundle
!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_") !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
win32 { win32 {
lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH/Nokia lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH/QtProject
lib ~= s,/,\\,g lib ~= s,/,\\,g
# the below gets added to later by testcase.prf # the below gets added to later by testcase.prf
check.commands = cd . & set PATH=$$lib;%PATH%& cmd /c check.commands = cd . & set PATH=$$lib;%PATH%& cmd /c

2
tests/auto/qttestrpath.pri
View File

@@ -1,6 +1,6 @@
linux-* { linux-* {
QMAKE_RPATHDIR += $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator 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, ":") IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")

4
tests/manual/debugger/simple/simple_test_app.cpp
View File

@@ -3592,9 +3592,9 @@ namespace qurl {
void testQUrl() void testQUrl()
{ {
QUrl url(QString("http://www.nokia.com")); QUrl url(QString("http://qt-project.org"));
BREAK_HERE; BREAK_HERE;
// Check url "http://www.nokia.com" QUrl. // Check url "http://qt-project.org" QUrl.
// Continue. // Continue.
dummyStatement(&url); dummyStatement(&url);
} }

4
tests/system/shared/qtcreator.py
View File

@@ -69,7 +69,7 @@ def __removeTmpSettingsDir__():
deleteDirIfExists(os.path.dirname(os.path.dirname(tmpSettingsDir))) deleteDirIfExists(os.path.dirname(os.path.dirname(tmpSettingsDir)))
def substituteTildeWithinToolchains(settingsDir): def substituteTildeWithinToolchains(settingsDir):
toolchains = os.path.join(settingsDir, "Nokia", 'qtcreator', 'toolchains.xml') toolchains = os.path.join(settingsDir, "QtProject", 'qtcreator', 'toolchains.xml')
origToolchains = toolchains + "_orig" origToolchains = toolchains + "_orig"
home = os.path.expanduser("~") home = os.path.expanduser("~")
os.rename(toolchains, origToolchains) os.rename(toolchains, origToolchains)
@@ -118,7 +118,7 @@ def substituteUnchosenTargetABIs(settingsDir):
CLOSED = 2 CLOSED = 2
on64Bit = __is64BitOS__() on64Bit = __is64BitOS__()
toolchains = os.path.join(settingsDir, "Nokia", 'qtcreator', 'toolchains.xml') toolchains = os.path.join(settingsDir, "QtProject", 'qtcreator', 'toolchains.xml')
origToolchains = toolchains + "_orig" origToolchains = toolchains + "_orig"
os.rename(toolchains, origToolchains) os.rename(toolchains, origToolchains)
origFile = open(origToolchains, "r") origFile = open(origToolchains, "r")

2
tests/valgrind/README
View File

@@ -8,7 +8,7 @@ mkdir valgrind-test
cd valgrind-test cd valgrind-test
# make library paths known to ldconfig # 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 # run qmake, make
qmake CONFIG+=debug IDE_BUILD_TREE=$(readlink -f ..) ../../path/to/qtc/tests/valgrind qmake CONFIG+=debug IDE_BUILD_TREE=$(readlink -f ..) ../../path/to/qtc/tests/valgrind

2
tests/valgrind/callgrind/modeltest.pro
View File

@@ -29,7 +29,7 @@ HEADERS += \
$$SRCDIR/plugins/valgrind/callgrindwidgethandler.h \ $$SRCDIR/plugins/valgrind/callgrindwidgethandler.h \
$$SRCDIR/plugins/valgrind/callgrindvisualisation.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 INCLUDEPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin # for ide_version.h