From ad93155a9e265e9708056ea3d14037255f18abb0 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Fri, 12 Jun 2009 14:57:48 +0200
Subject: [PATCH] Update some URLs.
Reviewed-by: TrustMe
---
doc/qtcreator.qdoc | 4 ++--
src/plugins/coreplugin/welcomemode.cpp | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 1c77d9d3420..e581466d443 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -12,7 +12,7 @@
the Linux, Mac OS X and Windows platforms.
\note Please report bugs and suggestions to the Qt Software task tracker at
- http://www.qtsoftware.com/developer/task-tracker. You can also join the
+ http://qt.nokia.com/developer/task-tracker. You can also join the
qt-creator@trolltech.com mailing list. To subscribe, send a message with
the word \e subscribe to qt-creator-request@trolltech.com. For more
information on Qt mailing lists, visit http://lists.trolltech.com
@@ -1461,7 +1461,7 @@
Open your project file (\c{.pro}) from the \gui{Projects} pane. Then,
follow the guidelines in the
- \l{http://doc.qtsoftware.com/latest/make-project-files.html#declaring-other-libraries}
+ \l{http://doc.trolltech.com/latest/make-project-files.html#declaring-other-libraries}
{Declaring other Libraries} section of the Qt documentation.
If your project successfully builds and links against the external library,
diff --git a/src/plugins/coreplugin/welcomemode.cpp b/src/plugins/coreplugin/welcomemode.cpp
index b0698088cef..b59523c6354 100644
--- a/src/plugins/coreplugin/welcomemode.cpp
+++ b/src/plugins/coreplugin/welcomemode.cpp
@@ -169,7 +169,7 @@ WelcomeMode::WelcomeMode() :
//: Add localized feed here only if one exists
m_d->rssFetcher->fetch(QUrl(tr("http://labs.trolltech.com/blogs/feed")));
- m_d->ui.sitesTreeWidget->addItem(tr("Qt Software"), QLatin1String("http://www.trolltech.com"));
+ m_d->ui.sitesTreeWidget->addItem(tr("Qt Software"), QLatin1String("http://qt.nokia.com"));
m_d->ui.sitesTreeWidget->addItem(tr("Qt Labs"), QLatin1String("http://labs.trolltech.com"));
m_d->ui.sitesTreeWidget->addItem(tr("Qt Git Hosting"), QLatin1String("http://qt.gitorious.org"));
m_d->ui.sitesTreeWidget->addItem(tr("Qt Centre"), QLatin1String("http://www.qtcentre.org"));
@@ -391,7 +391,7 @@ void WelcomeMode::slotOpenExample()
void WelcomeMode::slotFeedback()
{
QDesktopServices::openUrl(QUrl(QLatin1String(
- "http://www.trolltech.com/forms/feedback-forms/qt-creator-user-feedback/view")));
+ "http://qt.nokia.com/forms/feedback-forms/qt-creator-user-feedback/view")));
}
void WelcomeMode::slotCreateNewProject()
--
GitLab