diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:53:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-03-17 09:53:55 +0100 |
| commit | 0dc8719647eca19fd0828a86f5e61d21e0b774ad (patch) | |
| tree | 8702726a7044e325511725933ab5979fa43c9e90 | |
| parent | 92fde6d30180b261bfbd6c83429e88dbae4752f5 (diff) | |
| parent | 734663277730bc20dacf0a6b07427002a53cc107 (diff) | |
| download | qtwebkit-examples-0dc8719647eca19fd0828a86f5e61d21e0b774ad.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-beta1
Conflicts:
examples/webkitwidgets/browser/data/defaultbookmarks.xbel
examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp
Change-Id: I5b868d5eb612779b70f8bed123ef85c92caeeb06
| -rw-r--r-- | examples/webkitwidgets/browser/data/defaultbookmarks.xbel | 15 | ||||
| -rw-r--r-- | examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp | 2 |
2 files changed, 7 insertions, 10 deletions
diff --git a/examples/webkitwidgets/browser/data/defaultbookmarks.xbel b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel index 0828fcf..ee68ad0 100644 --- a/examples/webkitwidgets/browser/data/defaultbookmarks.xbel +++ b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel @@ -3,19 +3,13 @@ <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.io"> - <title>Qt.io Home Page</title> - </bookmark> <bookmark href="http://doc.qt.io/"> <title>Qt Documentation</title> </bookmark> - <bookmark href="http://planet.qt-project.org/"> + <bookmark href="http://planet.qt.io/"> <title>Qt Blog</title> </bookmark> <bookmark href="http://www.qtcentre.org/"> @@ -24,9 +18,12 @@ <bookmark href="http://qt-apps.org/"> <title>Qt-Apps.org</title> </bookmark> - <bookmark href="http://qt-project.org/wiki/OnlineCommunities/"> + <bookmark href="http://wiki.qt.io/OnlineCommunities"> <title>Online Communities</title> </bookmark> + <bookmark href="http://webkit.org/"> + <title>WebKit.org</title> + </bookmark> <bookmark href="http://xkcd.com/"> <title>xkcd</title> </bookmark> diff --git a/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp b/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp index 44c3732..1f57ba2 100644 --- a/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp +++ b/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp @@ -46,7 +46,7 @@ BookmarksView::BookmarksView(QWidget *parent) layout->addWidget(m_iconView); m_iconView->addItem("www.google.com"); - m_iconView->addItem("doc.qt.io/qt-5/"); + m_iconView->addItem("doc.qt.io/qt-5"); m_iconView->addItem("news.bbc.co.uk/2/mobile/default.stm"); m_iconView->addItem("mobile.wikipedia.org"); m_iconView->addItem("qt.io"); |