From 475a14135672411b4b6f15d0f70e8ce1f5adf7a7 Mon Sep 17 00:00:00 2001
From: hjk <qtc-committer@nokia.com>
Date: Fri, 14 Aug 2009 09:37:15 +0200
Subject: [PATCH] long live the king
---
doc/qtcreator.qdoc | 2 +-
src/plugins/welcome/communitywelcomepagewidget.cpp | 5 +----
src/plugins/welcome/welcomemode.cpp | 2 +-
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index b13ad71f350..0f0f246e593 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 task tracker at
- http://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
diff --git a/src/plugins/welcome/communitywelcomepagewidget.cpp b/src/plugins/welcome/communitywelcomepagewidget.cpp
index 2e7129c8f12..40b39517c16 100644
--- a/src/plugins/welcome/communitywelcomepagewidget.cpp
+++ b/src/plugins/welcome/communitywelcomepagewidget.cpp
@@ -54,7 +54,7 @@ CommunityWelcomePageWidget::CommunityWelcomePageWidget(QWidget *parent) :
//: Add localized feed here only if one exists
m_rssFetcher->fetch(QUrl(tr("http://labs.trolltech.com/blogs/feed")));
- ui->sitesTreeWidget->addItem(tr("Qt Home"), QLatin1String("http://qtsoftware.com"));
+ ui->sitesTreeWidget->addItem(tr("Qt Home"), QLatin1String("http://qt.nokia.com"));
ui->sitesTreeWidget->addItem(tr("Qt Labs"), QLatin1String("http://labs.trolltech.com"));
ui->sitesTreeWidget->addItem(tr("Qt Git Hosting"), QLatin1String("http://qt.gitorious.org"));
ui->sitesTreeWidget->addItem(tr("Qt Centre"), QLatin1String("http://www.qtcentre.org"));
@@ -67,13 +67,10 @@ CommunityWelcomePageWidget::~CommunityWelcomePageWidget()
delete ui;
}
-
void CommunityWelcomePageWidget::slotUrlClicked(const QString &data)
{
QDesktopServices::openUrl(QUrl(data));
}
-
-
} // namespace Internal
} // namespace Welcome
diff --git a/src/plugins/welcome/welcomemode.cpp b/src/plugins/welcome/welcomemode.cpp
index 5c7db18033b..c3812c0d10f 100644
--- a/src/plugins/welcome/welcomemode.cpp
+++ b/src/plugins/welcome/welcomemode.cpp
@@ -219,7 +219,7 @@ void WelcomeMode::showClickedPage()
void WelcomeMode::slotFeedback()
{
QDesktopServices::openUrl(QUrl(QLatin1String(
- "http://qtsoftware.com/forms/feedback-forms/qt-creator-user-feedback/view")));
+ "http://qt.nokia.com/forms/feedback-forms/qt-creator-user-feedback/view")));
}
--
GitLab