aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dist/changes-2.1.02
-rw-r--r--doc/api/coding-style.qdoc2
-rw-r--r--doc/api/external-tool-spec.qdoc4
-rw-r--r--doc/api/first-plugin.qdoc4
-rw-r--r--doc/api/qtcreator-dev-wizards.qdoc2
-rw-r--r--doc/api/qtcreator-dev.qdoc14
-rw-r--r--share/qtcreator/qml/qmlobserver/main.cpp4
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp4
-rw-r--r--share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp4
-rw-r--r--share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro6
-rw-r--r--share/qtcreator/welcomescreen/gettingstarted.qml6
-rw-r--r--share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml2
-rw-r--r--share/qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml10
-rw-r--r--src/app/Info.plist.in2
-rw-r--r--src/app/main.cpp6
-rw-r--r--src/libs/extensionsystem/iplugin.cpp2
-rw-r--r--src/plugins/git/gitorious/gitorious.cpp2
-rw-r--r--src/plugins/git/gitorious/gitorious.h6
18 files changed, 41 insertions, 41 deletions
diff --git a/dist/changes-2.1.0 b/dist/changes-2.1.0
index dd18dc25daf..c43a0fda68c 100644
--- a/dist/changes-2.1.0
+++ b/dist/changes-2.1.0
@@ -12,7 +12,7 @@ General
Editing
* Generic highlighter:
- http://labs.qt.nokia.com/2010/09/16/generic-highlighter-in-qt-creator/
+ http://blog.qt.digia.com/2010/09/16/generic-highlighter-in-qt-creator/
C++ Support
* Added semantic highlighting of types, virtual methods, locals, statics and
diff --git a/doc/api/coding-style.qdoc b/doc/api/coding-style.qdoc
index ccac8f3aa3c..fbb1914bd71 100644
--- a/doc/api/coding-style.qdoc
+++ b/doc/api/coding-style.qdoc
@@ -640,7 +640,7 @@
does not have signals or slots, if it is intended to be used
with qobject_cast<>. See also \l{Casting}.
\o Normalize the arguments for signals and slots
- (see \l{http://doc.qt.nokia.com/4.7/qmetaobject.html#normalizedSignature}{QMetaObject::normalizedSignature}
+ (see \l{http://qt-project.org/doc/qt-4.8/qmetaobject.html#normalizedSignature}{QMetaObject::normalizedSignature}
inside connect statements
to safely make signal and slot lookup a few cycles faster.
You can use $QTDIR/util/normalize to normalize existing code.
diff --git a/doc/api/external-tool-spec.qdoc b/doc/api/external-tool-spec.qdoc
index 0926f34baa1..2016f79b3db 100644
--- a/doc/api/external-tool-spec.qdoc
+++ b/doc/api/external-tool-spec.qdoc
@@ -34,8 +34,8 @@
\section1 Location
- User specific tools are located in \c {$HOME/.config/Nokia/qtcreator/externaltools}
- on Mac and Linux, and in \c {%APPDATA%\Nokia\qtcreator\externaltools} on Windows.
+ User specific tools are located in \c {$HOME/.config/QtProject/qtcreator/externaltools}
+ on Mac and Linux, and in \c {%APPDATA%\QtProject\qtcreator\externaltools} on Windows.
System wide tools are located in \c {<Qt Creator install>/share/qtcreator/externaltools}
on Windows and Linux, and in \c {Qt Creator.app/Contents/Resources/externaltools} on Mac.
diff --git a/doc/api/first-plugin.qdoc b/doc/api/first-plugin.qdoc
index 1a2dc423ffc..1925dc33011 100644
--- a/doc/api/first-plugin.qdoc
+++ b/doc/api/first-plugin.qdoc
@@ -98,7 +98,7 @@
plugin directory (requires you to have write permissions there).
The other option, \gui{Local user settings}, sets your .pro file up to
deploy your plugin into \QC's user plugin path
- (for example \c{~/.config/Nokia/qtcreator/plugins} on Unix systems).
+ (for example \c{~/.config/QtProject/qtcreator/plugins} on Unix systems).
We choose \gui{Qt Creator build} because we use a self-compiled
\QC, and want the plugin to be only loaded by that \QC
instance.
@@ -223,7 +223,7 @@
need to add the corresponding .pri file of the plugin here.
For more information about qmake, and writing .pro files in general,
- see the \l{http://doc.qt.nokia.com/4.7/qmake-manual.html}{qmake Manual}.
+ see the \l{http://qt-project.org/doc/qt-4.8/qmake-manual.html}{qmake Manual}.
\section1 Plugin Specification
diff --git a/doc/api/qtcreator-dev-wizards.qdoc b/doc/api/qtcreator-dev-wizards.qdoc
index ba0f2f721ea..a4783b07d17 100644
--- a/doc/api/qtcreator-dev-wizards.qdoc
+++ b/doc/api/qtcreator-dev-wizards.qdoc
@@ -23,7 +23,7 @@
\section1 Introduction
If the functionality provided by template-based
- \l{http://doc.qt.nokia.com/qtcreator-snapshot/creator-project-wizards.html}{custom wizards}
+ \l{http://doc.qt.digia.com/qtcreator-snapshot/creator-project-wizards.html}{custom wizards}
is not sufficient for your case, you can write wizards in code.
A wizard in Qt Creator is an instance of a class implementing
diff --git a/doc/api/qtcreator-dev.qdoc b/doc/api/qtcreator-dev.qdoc
index 493b70ad54e..56527b50077 100644
--- a/doc/api/qtcreator-dev.qdoc
+++ b/doc/api/qtcreator-dev.qdoc
@@ -53,7 +53,7 @@
to which you can add your own snippets.
\list
- \o \l{http://doc.qt.nokia.com/qtcreator/creator-completing-code.html#editing-code-snippets}
+ \o \l{http://doc.qt.digia.com/qtcreator/creator-completing-code.html#editing-code-snippets}
{Snippets User Interface}
\o \l{Snippets} {Adding Snippets Groups}
\endlist
@@ -64,7 +64,7 @@
own
file and project templates by writing XML definition files for them.
\list
- \o \l{http://doc.qt.nokia.com/qtcreator/creator-project-wizards.html}
+ \o \l{http://doc.qt.digia.com/qtcreator/creator-project-wizards.html}
{Adding New Custom Wizards}
\o \l{User Interface Text Guidelines}
\endlist
@@ -96,7 +96,7 @@
the MIME type definitions in Qt Creator to your specific setup,
by adding or removing file extensions and specifying magic headers.
\list
- \o \l{http://doc.qt.nokia.com/qtcreator/creator-mime-types.html}
+ \o \l{http://doc.qt.digia.com/qtcreator/creator-mime-types.html}
{Editing MIME Types}
\o \l{http://standards.freedesktop.org/shared-mime-info-spec/shared-mime-info-spec-latest.html}
{MIME Type Specification Files}
@@ -110,7 +110,7 @@
provided by the Kate Editor. You can download highlight definition files
for use with Qt Creator and create your own definition files.
\list
- \o \l{http://doc.qt.nokia.com/qtcreator/creator-editor-options.html#generic-highlighting}
+ \o \l{http://doc.qt.digia.com/qtcreator/creator-editor-options.html#generic-highlighting}
{Generic Highlighting}
\o \l{http://kate-editor.org/2005/03/24/writing-a-syntax-highlighting-file/}
{Writing a Syntax Highlighting File}
@@ -162,7 +162,7 @@
to fill a feature suggestion.
The tool descriptions are saved as XML files that you can share.
\list
- \o \l{http://doc.qt.nokia.com/qtcreator/creator-editor-external.html}
+ \o \l{http://doc.qt.digia.com/qtcreator/creator-editor-external.html}
{Using External Tools}
\o \l{External Tool Specification Files}
\endlist
@@ -189,7 +189,7 @@
If you need a way to configure the tool in Qt Creator, you can add an
\gui Options page for it.
\list
- \o \l{http://doc.qt.nokia.com/qtcreator/creator-editor-external.html}
+ \o \l{http://doc.qt.digia.com/qtcreator/creator-editor-external.html}
{Using External Tools}
\o \l{External Tool Specification Files}
\o \l{Creating Plugins}
@@ -214,7 +214,7 @@
the \gui {Issues} output
pane.
\list
- \o \l{http://doc.qt.nokia.com/qtcreator/creator-task-lists.html}
+ \o \l{http://doc.qt.digia.com/qtcreator/creator-task-lists.html}
{Showing Task List Files in the Issues Pane}
\o \l{Creating Plugins}
\o \l{Qt Creator Coding Rules}
diff --git a/share/qtcreator/qml/qmlobserver/main.cpp b/share/qtcreator/qml/qmlobserver/main.cpp
index c7d791ef119..0f9e975522a 100644
--- a/share/qtcreator/qml/qmlobserver/main.cpp
+++ b/share/qtcreator/qml/qmlobserver/main.cpp
@@ -545,8 +545,8 @@ int main(int argc, char ** argv)
Application app(argc, argv);
app.setApplicationName("QtQmlViewer");
- app.setOrganizationName("Nokia");
- app.setOrganizationDomain("nokia.com");
+ app.setOrganizationName("QtProject");
+ app.setOrganizationDomain("qt-project.org");
QDeclarativeViewer::registerTypes();
QDeclarativeTester::registerTypes();
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp
index 6dd2baef899..63844a34c93 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/main.cpp
@@ -46,8 +46,8 @@ int main(int argc, char *argv[])
{
QApplication application(argc, argv);
- QCoreApplication::setOrganizationName("Nokia");
- QCoreApplication::setOrganizationDomain("nokia.com");
+ QCoreApplication::setOrganizationName("QtProject");
+ QCoreApplication::setOrganizationDomain("qt-project.org");
QCoreApplication::setApplicationName("Qml2Puppet");
QCoreApplication::setApplicationVersion("1.0.0");
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp
index dfb75acfdb6..92b5f13dc63 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/main.cpp
@@ -53,8 +53,8 @@ int main(int argc, char *argv[])
QApplication application(argc, argv);
- QCoreApplication::setOrganizationName("Nokia");
- QCoreApplication::setOrganizationDomain("nokia.com");
+ QCoreApplication::setOrganizationName("QtProject");
+ QCoreApplication::setOrganizationDomain("qt-project.org");
QCoreApplication::setApplicationName("QmlPuppet");
QCoreApplication::setApplicationVersion("1.1.0");
diff --git a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
index 2304bc393dd..8bf2f3358a1 100644
--- a/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
+++ b/share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro
@@ -24,9 +24,9 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=%QtCreatorBuild%
## 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/data/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/data/QtProject/qtcreator" on Linux
+## "~/Library/Application Support/QtProject/Qt Creator" on Mac
%DestDir%USE_USER_DESTDIR = yes
PROVIDER = %VendorName%
diff --git a/share/qtcreator/welcomescreen/gettingstarted.qml b/share/qtcreator/welcomescreen/gettingstarted.qml
index f7080a6005f..dbd718fbc68 100644
--- a/share/qtcreator/welcomescreen/gettingstarted.qml
+++ b/share/qtcreator/welcomescreen/gettingstarted.qml
@@ -129,13 +129,13 @@ Rectangle {
IconAndLink {
iconName: "communityIcon"
linkText: qsTr("Online Community")
- onClicked: gettingStarted.openUrl("http://developer.qt.nokia.com/forums")
+ onClicked: gettingStarted.openUrl("http://qt-project.org/forums")
}
IconAndLink {
iconName: "labsIcon"
- linkText: qsTr("Labs")
- onClicked: gettingStarted.openUrl("http://labs.qt.nokia.com")
+ linkText: qsTr("Blogs")
+ onClicked: gettingStarted.openUrl("http://planet.qt-project.org")
}
}
diff --git a/share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml b/share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml
index 14096a0fd1a..dd82949d407 100644
--- a/share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml
+++ b/share/qtcreator/welcomescreen/widgets/dummydata/context/ExampleDelegate.qml
@@ -34,6 +34,6 @@ DummyContextObject {
property variant model: QtObject {
property string name: "Calculator"
property string description: "his demo shows how to write a simple calculator application in QML and JavaScript."
- property string imageSource: "http://doc.qt.nokia.com/4.7/images/qml-calculator-example-small.png"
+ property string imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-calculator-example-small.png"
}
}
diff --git a/share/qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml b/share/qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml
index 0e81fc4fee4..c591a474eae 100644
--- a/share/qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml
+++ b/share/qtcreator/welcomescreen/widgets/dummydata/examplesModel.qml
@@ -33,27 +33,27 @@ ListModel {
ListElement {
name: "Calculator with more info on something bla bla on Qt if you know"
description: "his demo shows how to write a simple calculator application in QML and JavaScript."
- imageSource: "http://doc.qt.nokia.com/4.7/images/qml-calculator-example-small.png"
+ imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-calculator-example-small.png"
}
ListElement {
name: "RSS News Reader"
description: "This demo shows how to write a RSS news reader in QML."
- imageSource: "http://doc.qt.nokia.com/4.7/images/qml-rssnews-demo-small.png"
+ imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-rssnews-demo-small.png"
}
ListElement {
name: "Twitter"
description: "This demo shows how to write a mobile Twitter search client in QML. Use it to see what people think about Qt Quick!"
- imageSource: "http://doc.qt.nokia.com/4.7/images/qml-twitter-demo-small.png"
+ imageSource: "http://qt-project.org/doc/qt-4.8/images/qml-twitter-demo-small.png"
}
ListElement {
name: "Basic Drawing Example"
description: "The Basic Drawing example shows how to display basic graphics primitives in a variety of styles using the QPainter class."
- imageSource: "http://doc.qt.nokia.com/4.7/images/basicdrawing-example.png"
+ imageSource: "http://qt-project.org/doc/qt-4.8/images/basicdrawing-example.png"
}
ListElement {
name: "Border Layout Example"
description: "The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules. The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules. The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules. The Border Layout example shows how to create a custom layout that arranges child widgets according to a simple set of rules."
- imageSource: "http://doc.qt.nokia.com/4.7/images/borderlayout-example.png"
+ imageSource: "http://qt-project.org/doc/qt-4.8/images/borderlayout-example.png"
}
}
diff --git a/src/app/Info.plist.in b/src/app/Info.plist.in
index 67c16799560..9cc0ee54237 100644
--- a/src/app/Info.plist.in
+++ b/src/app/Info.plist.in
@@ -212,7 +212,7 @@
<key>CFBundleExecutable</key>
<string>Qt Creator</string>
<key>CFBundleIdentifier</key>
- <string>com.nokia.qtcreator</string>
+ <string>org.qt-project.qtcreator</string>
<key>CFBundleVersion</key>
<string>$$QTCREATOR_VERSION</string>
<key>CFBundleShortVersionString</key>
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 20e68465582..557678fafcf 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -209,9 +209,9 @@ static inline QStringList getPluginPaths()
#endif
// 3) <localappdata>/plugins/<ideversion>
// where <localappdata> is e.g.
- // <drive>:\Users\<username>\AppData\Local\Nokia\qtcreator on Windows Vista and later
- // $XDG_DATA_HOME or ~/.local/share/data/Nokia/qtcreator on Linux
- // ~/Library/Application Support/Nokia/Qt Creator on Mac
+ // <drive>:\Users\<username>\AppData\Local\QtProject\qtcreator on Windows Vista and later
+ // $XDG_DATA_HOME or ~/.local/share/data/QtProject/qtcreator on Linux
+ // ~/Library/Application Support/QtProject/Qt Creator on Mac
pluginPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
pluginPath += QLatin1Char('/')
+ QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR)
diff --git a/src/libs/extensionsystem/iplugin.cpp b/src/libs/extensionsystem/iplugin.cpp
index 4d8e6b797c7..692f7f208c2 100644
--- a/src/libs/extensionsystem/iplugin.cpp
+++ b/src/libs/extensionsystem/iplugin.cpp
@@ -56,7 +56,7 @@
in a library that matches the \c name attribute given in their
XML description. The IPlugin implementation must be exported and
made known to Qt's plugin system, see the Qt Documentation on the
- \l{http://doc.qt.nokia.com/4.7/qtplugin.html#Q_EXPORT_PLUGIN2}
+ \l{http://qt-project.org/doc/qt-4.8/qtplugin.html#Q_EXPORT_PLUGIN2}
{Q_EXPORT_PLUGIN2 macro}.
After the plugins' XML files have been read, and dependencies have been
diff --git a/src/plugins/git/gitorious/gitorious.cpp b/src/plugins/git/gitorious/gitorious.cpp
index 588fc904e5b..18b5afbf240 100644
--- a/src/plugins/git/gitorious/gitorious.cpp
+++ b/src/plugins/git/gitorious/gitorious.cpp
@@ -281,7 +281,7 @@ QList<GitoriousRepository> GitoriousProjectReader::readRepositories(QXmlStreamRe
int defaultType = -1;
// The "mainlines"/"clones" elements are not used in the
- // Nokia setup, handle them optionally.
+ // QtProject setup, handle them optionally.
while (!reader.atEnd()) {
reader.readNext();
diff --git a/src/plugins/git/gitorious/gitorious.h b/src/plugins/git/gitorious/gitorious.h
index e85868ef610..f38e4460967 100644
--- a/src/plugins/git/gitorious/gitorious.h
+++ b/src/plugins/git/gitorious/gitorious.h
@@ -51,9 +51,9 @@ struct GitoriousRepository
enum Type {
MainLineRepository,
CloneRepository,
- BaselineRepository, // Nokia extension
- SharedRepository, // Nokia extension
- PersonalRepository // Nokia extension
+ BaselineRepository, // QtProject extension
+ SharedRepository, // QtProject extension
+ PersonalRepository // QtProject extension
};
GitoriousRepository();
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 17:29:48 +0000