diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index 1c77d9d342062a5f76ff2f7316a0468e1f5955aa..e581466d443966aef9381a639d7591fbaff04c4f 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 b0698088cef773410a4af1bd2e1430f263b1126e..b59523c6354c71f08de50a42730aa5a6d2c9a485 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()