summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2009-08-11 07:40:03 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-08-11 07:40:03 (GMT)
commita958ab9c98481100870a87ee07b8e0abddbfc804 (patch)
treee8d5c8f4e5b6b33942af6fac748e7fa9feef8d9c /src/gui
parent411991d0e6a04085d9f8379ceccce337c5b6e818 (diff)
downloadQt-a958ab9c98481100870a87ee07b8e0abddbfc804.zip
Qt-a958ab9c98481100870a87ee07b8e0abddbfc804.tar.gz
Qt-a958ab9c98481100870a87ee07b8e0abddbfc804.tar.bz2
Qt's domain name is now qt.nokia.com.
Reviewed-by: Trust Me
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/dialogs/qmessagebox.cpp4
-rw-r--r--src/gui/kernel/qwidget.cpp2
-rw-r--r--src/gui/text/qtextformat.cpp2
-rw-r--r--src/gui/widgets/qvalidator.cpp4
4 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/dialogs/qmessagebox.cpp b/src/gui/dialogs/qmessagebox.cpp
index cbb5cdc..65fae98 100644
--- a/src/gui/dialogs/qmessagebox.cpp
+++ b/src/gui/dialogs/qmessagebox.cpp
@@ -1715,10 +1715,10 @@ void QMessageBox::aboutQt(QWidget *parent, const QString &title)
"use such applications in combination with software subject to the "
"terms of the GNU GPL version 3.0 or where you are otherwise willing "
"to comply with the terms of the GNU GPL version 3.0.</p>"
- "<p>Please see <a href=\"http://www.qtsoftware.com/products/licensing\">www.qtsoftware.com/products/licensing</a> "
+ "<p>Please see <a href=\"http://qt.nokia.com/products/licensing\">qt.nokia.com/products/licensing</a> "
"for an overview of Qt licensing.</p>"
"<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).</p>"
- "<p>Qt is a Nokia product. See <a href=\"http://www.qtsoftware.com/qt/\">www.qtsoftware.com/qt</a> "
+ "<p>Qt is a Nokia product. See <a href=\"http://qt.nokia.com/\">qt.nokia.com</a> "
"for more information.</p>"
).arg(QLatin1String(QT_VERSION_STR));
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 2055714..d847609 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -4194,7 +4194,7 @@ void QWidget::setForegroundRole(QPalette::ColorRole role)
assigning roles to a widget's palette is not guaranteed to change the
appearance of the widget. Instead, you may choose to apply a \l
styleSheet. You can refer to our Knowledge Base article
- \l{http://qtsoftware.com/developer/knowledgebase/22}{here} for more
+ \l{http://qt.nokia.com/developer/knowledgebase/22}{here} for more
information.
\warning Do not use this function in conjunction with \l{Qt Style Sheets}.
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index 9405e81..3e127b7 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -1562,7 +1562,7 @@ void QTextCharFormat::setUnderlineStyle(UnderlineStyle style)
\fn void QTextCharFormat::setAnchorHref(const QString &value)
Sets the hypertext link for the text format to the given \a value.
- This is typically a URL like "http://qtsoftware.com/index.html".
+ This is typically a URL like "http://example.com/index.html".
The anchor will be displayed with the \a value as its display text;
if you want to display different text call setAnchorNames().
diff --git a/src/gui/widgets/qvalidator.cpp b/src/gui/widgets/qvalidator.cpp
index 8580109..f562f2f 100644
--- a/src/gui/widgets/qvalidator.cpp
+++ b/src/gui/widgets/qvalidator.cpp
@@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE
Intermediate, and "asdf" and 1114 is \l Invalid.
\i For an editable combobox that accepts URLs, any well-formed URL
- is \l Acceptable, "http://qtsoftware.com/," is \l Intermediate
+ is \l Acceptable, "http://example.com/," is \l Intermediate
(it might be a cut and paste action that accidentally took in a
comma at the end), the empty string is \l Intermediate (the user
might select and delete all of the text in preparation for entering
@@ -98,7 +98,7 @@ QT_BEGIN_NAMESPACE
\i For a spin box that accepts lengths, "11cm" and "1in" are \l
Acceptable, "11" and the empty string are \l Intermediate, and
- "http://qtsoftware.com" and "hour" are \l Invalid.
+ "http://example.com" and "hour" are \l Invalid.
\endlist