summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2012-11-16 13:50:26 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-16 18:55:52 +0100
commit57629dcb40a465899585a69b737edf6d60332aa7 (patch)
tree1948889329833d112329d9f60a8589797e770e4f
parent0a8269a966a62c3bece810b042b0c369e019ec42 (diff)
downloadqtwebkit-examples-57629dcb40a465899585a69b737edf6d60332aa7.tar.gz
Example: Set qt-project.org as home for the Browser example
And update other links. Change-Id: I45815e085e2e465568f8b23a551b1123797360c3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
-rw-r--r--examples/browser/data/defaultbookmarks.xbel14
-rw-r--r--examples/browser/settings.cpp2
2 files changed, 8 insertions, 8 deletions
diff --git a/examples/browser/data/defaultbookmarks.xbel b/examples/browser/data/defaultbookmarks.xbel
index a9a30a8..7a95e36 100644
--- a/examples/browser/data/defaultbookmarks.xbel
+++ b/examples/browser/data/defaultbookmarks.xbel
@@ -3,19 +3,19 @@
<xbel version="1.0">
<folder folded="yes">
<title>Bookmarks Bar</title>
- <bookmark href="http://qt.digia.com/">
+ <bookmark href="http://qt-project.org/">
<title>Qt Home Page</title>
</bookmark>
<bookmark href="http://webkit.org/">
<title>WebKit.org</title>
</bookmark>
- <bookmark href="http://doc.qt.digia.com">
+ <bookmark href="http://qt-project.org/doc/">
<title>Qt Documentation</title>
</bookmark>
- <bookmark href="http://qt-project.org">
- <title>Qt Project</title>
+ <bookmark href="http://qt-project.org/quarterly/">
+ <title>Qt Quarterly</title>
</bookmark>
- <bookmark href="http://blog.qt.digia.com/">
+ <bookmark href="http://planet.qt-project.org/">
<title>Qt Blog</title>
</bookmark>
<bookmark href="http://www.qtcentre.org/">
@@ -24,8 +24,8 @@
<bookmark href="http://qt-apps.org/">
<title>Qt-Apps.org</title>
</bookmark>
- <bookmark href="http://qtnode.net/">
- <title>qtnode</title>
+ <bookmark href="http://qt-project.org/wiki/OnlineCommunities/">
+ <title>Online Communities</title>
</bookmark>
<bookmark href="http://xkcd.com/">
<title>xkcd</title>
diff --git a/examples/browser/settings.cpp b/examples/browser/settings.cpp
index 3689bd0..501c890 100644
--- a/examples/browser/settings.cpp
+++ b/examples/browser/settings.cpp
@@ -89,7 +89,7 @@ void SettingsDialog::loadFromSettings()
{
QSettings settings;
settings.beginGroup(QLatin1String("MainWindow"));
- QString defaultHome = QLatin1String("http://doc.qt.digia.com");
+ QString defaultHome = QLatin1String("http://qt-project.org/");
homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
settings.endGroup();