diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:59:49 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-06-03 10:59:49 +0200 |
commit | 27a822a088991c2d92a4b31f86c86dc6692fa055 (patch) | |
tree | 271289873262d7c5aaa4b520a7ad8b2b5cec6c39 | |
parent | 98d82b4cd928bcf9ccc5ad0dc122770aaaf232ef (diff) | |
parent | f5230ca1daad6923e4f307e82337bf93424b73a4 (diff) | |
download | qtwebkit-examples-27a822a088991c2d92a4b31f86c86dc6692fa055.tar.gz |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I03ffc970213da3aacf20a8f0ed2f585997af8a2b
3 files changed, 10 insertions, 12 deletions
diff --git a/examples/webkitwidgets/browser/browserapplication.cpp b/examples/webkitwidgets/browser/browserapplication.cpp index 05d277e..37d2e43 100644 --- a/examples/webkitwidgets/browser/browserapplication.cpp +++ b/examples/webkitwidgets/browser/browserapplication.cpp @@ -115,7 +115,8 @@ BrowserApplication::BrowserApplication(int &argc, char **argv) m_correctlyInitialized = true; - QString serverName = QCoreApplication::applicationName(); + QString serverName = QCoreApplication::applicationName() + + QString::fromLatin1(QT_VERSION_STR).remove('.') + QLatin1String("webkit"); QLocalSocket socket; socket.connectToServer(serverName); if (socket.waitForConnected(500)) { @@ -201,7 +202,7 @@ void BrowserApplication::quitBrowser() clean(); int tabCount = 0; for (int i = 0; i < m_mainWindows.count(); ++i) { - tabCount =+ m_mainWindows.at(i)->tabWidget()->count(); + tabCount += m_mainWindows.at(i)->tabWidget()->count(); } if (tabCount > 1) { 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"); |