diff options
| author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:52:15 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:52:15 +0200 |
| commit | 0fd4ec1f79ce808f51a6d435c20739c8c40abd77 (patch) | |
| tree | 2051cbdb74c9f434b70185da721ed447c37a3fb9 /examples/webkitwidgets/browser/data/defaultbookmarks.xbel | |
| parent | c8e7417c3a8366ac423efef73b6d97cea70ada61 (diff) | |
| parent | bce5056b9e16a943357e362455a46685d3f22093 (diff) | |
| download | qtwebkit-examples-0fd4ec1f79ce808f51a6d435c20739c8c40abd77.tar.gz | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: If9c3bf3632b0203818aefd12a973f08d60908c91
Diffstat (limited to 'examples/webkitwidgets/browser/data/defaultbookmarks.xbel')
| -rw-r--r-- | examples/webkitwidgets/browser/data/defaultbookmarks.xbel | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/examples/webkitwidgets/browser/data/defaultbookmarks.xbel b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel index 7a95e36..a616c76 100644 --- a/examples/webkitwidgets/browser/data/defaultbookmarks.xbel +++ b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel @@ -9,12 +9,12 @@ <bookmark href="http://webkit.org/"> <title>WebKit.org</title> </bookmark> + <bookmark href="http://qt.digia.com"> + <title>Digia Qt Home Page</title> + </bookmark> <bookmark href="http://qt-project.org/doc/"> <title>Qt Documentation</title> </bookmark> - <bookmark href="http://qt-project.org/quarterly/"> - <title>Qt Quarterly</title> - </bookmark> <bookmark href="http://planet.qt-project.org/"> <title>Qt Blog</title> </bookmark> |