diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-11 11:24:20 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-11-11 11:24:20 +0100 |
| commit | c254868dc2bd5772494a48686ebbc3e867a86adf (patch) | |
| tree | 76c33df85ab2ef13e44f7677b43439c7b0d3b36a /examples/webenginewidgets/browser/data/defaultbookmarks.xbel | |
| parent | fca9015175950b04bafb9b3af7d4e693eb0243d9 (diff) | |
| parent | aa1b2d20a80f53ce5e7f6097114d41a018d9350b (diff) | |
| download | qtwebengine-c254868dc2bd5772494a48686ebbc3e867a86adf.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/core/browser_context_qt.cpp
src/webengine/api/qquickwebengineview_p.h
Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c
Diffstat (limited to 'examples/webenginewidgets/browser/data/defaultbookmarks.xbel')
| -rw-r--r-- | examples/webenginewidgets/browser/data/defaultbookmarks.xbel | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/examples/webenginewidgets/browser/data/defaultbookmarks.xbel b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel index 7a95e36b3..a981d2de2 100644 --- a/examples/webenginewidgets/browser/data/defaultbookmarks.xbel +++ b/examples/webenginewidgets/browser/data/defaultbookmarks.xbel @@ -3,18 +3,12 @@ <xbel version="1.0"> <folder folded="yes"> <title>Bookmarks Bar</title> - <bookmark href="http://qt-project.org/"> + <bookmark href="http://qt.io/"> <title>Qt Home Page</title> </bookmark> - <bookmark href="http://webkit.org/"> - <title>WebKit.org</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> @@ -27,6 +21,9 @@ <bookmark href="http://qt-project.org/wiki/OnlineCommunities/"> <title>Online Communities</title> </bookmark> + <bookmark href="http://www.chromium.org/"> + <title>The Chromium Projects</title> + </bookmark> <bookmark href="http://xkcd.com/"> <title>xkcd</title> </bookmark> |