summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorCaroline Chao <caroline.chao@digia.com>2012-11-09 13:09:32 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-09 13:19:32 +0100
commit7764099211f0f2301f636bd4cb953b0f9e7f4476 (patch)
tree6e8b40fa41ab96ba2a91d861950634efa6775848 /examples
parent11091ef3ec755535de3398e5ac0c99741831cd81 (diff)
downloadqtwebkit-examples-7764099211f0f2301f636bd4cb953b0f9e7f4476.tar.gz
Browser example: update bookmarks
Replace links pointing to Nokia with Digia's. Change-Id: Ia9736783ee57c9840191ea55d3d5eadade2cdaa7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'examples')
-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 dce5297..a9a30a8 100644
--- a/examples/browser/data/defaultbookmarks.xbel
+++ b/examples/browser/data/defaultbookmarks.xbel
@@ -3,20 +3,20 @@
<xbel version="1.0">
<folder folded="yes">
<title>Bookmarks Bar</title>
- <bookmark href="http://qt.nokia.com/">
+ <bookmark href="http://qt.digia.com/">
<title>Qt Home Page</title>
</bookmark>
<bookmark href="http://webkit.org/">
<title>WebKit.org</title>
</bookmark>
- <bookmark href="http://qt.nokia.com/doc/">
+ <bookmark href="http://doc.qt.digia.com">
<title>Qt Documentation</title>
</bookmark>
- <bookmark href="http://qt.nokia.com/doc/qq/">
- <title>Qt Quarterly</title>
+ <bookmark href="http://qt-project.org">
+ <title>Qt Project</title>
</bookmark>
- <bookmark href="http://labs.qt.nokia.com/">
- <title>Qt Labs</title>
+ <bookmark href="http://blog.qt.digia.com/">
+ <title>Qt Blog</title>
</bookmark>
<bookmark href="http://www.qtcentre.org/">
<title>Qt Centre</title>
@@ -30,7 +30,7 @@
<bookmark href="http://xkcd.com/">
<title>xkcd</title>
</bookmark>
- <bookmark href="http://twitter.com/qtbynokia">
+ <bookmark href="http://twitter.com/qtproject">
<title>Twitter</title>
</bookmark>
</folder>
diff --git a/examples/browser/settings.cpp b/examples/browser/settings.cpp
index 9bf53aa..3689bd0 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.nokia.com");
+ QString defaultHome = QLatin1String("http://doc.qt.digia.com");
homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
settings.endGroup();