Commit ad93155a authored by Daniel Molkentin's avatar Daniel Molkentin

Update some URLs.

Reviewed-by: TrustMe
parent 47d766d9
......@@ -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,
......
......@@ -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()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment