From 8c87b434fd7bc45bd65a8f846b9eeb56248ca0da Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 2 Mar 2015 11:38:16 +0100 Subject: Replace old qt-project.org wiki with wiki.qt.io MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia6984a4382c4c32e9e28a696dfc85bd59d831140 Reviewed-by: Topi Reiniö --- examples/webkitwidgets/browser/data/defaultbookmarks.xbel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/webkitwidgets/browser/data/defaultbookmarks.xbel b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel index a616c76..2374e48 100644 --- a/examples/webkitwidgets/browser/data/defaultbookmarks.xbel +++ b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel @@ -24,7 +24,7 @@ Qt-Apps.org - + Online Communities -- cgit v1.2.3 From 44902623663d4a9435a3fa9b29504807703f2c78 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Tue, 3 Mar 2015 11:23:29 +0100 Subject: Adjust wiki links to the new redirect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit it looks nicer this way Change-Id: I689ec3945bca341c86713c03fa91eb877dbae5e5 Reviewed-by: Topi Reiniö --- examples/webkitwidgets/browser/data/defaultbookmarks.xbel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/webkitwidgets/browser/data/defaultbookmarks.xbel b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel index 2374e48..32999eb 100644 --- a/examples/webkitwidgets/browser/data/defaultbookmarks.xbel +++ b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel @@ -24,7 +24,7 @@ Qt-Apps.org - + Online Communities -- cgit v1.2.3 From 734663277730bc20dacf0a6b07427002a53cc107 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 4 Mar 2015 22:56:29 +0100 Subject: Update links from qt-project.org to qt.io - remove http://qt.digia.com since it now points to qt.io - move webkit.org down to match other repos Change-Id: I036b3ed84bdd8023fd32b7e9ccfde787ce666939 Reviewed-by: Venugopal Shivashankar --- examples/webkitwidgets/browser/data/defaultbookmarks.xbel | 15 ++++++--------- .../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 32999eb..ee68ad0 100644 --- a/examples/webkitwidgets/browser/data/defaultbookmarks.xbel +++ b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel @@ -3,19 +3,13 @@ Bookmarks Bar - + Qt Home Page - - WebKit.org - - - Digia Qt Home Page - - + Qt Documentation - + Qt Blog @@ -27,6 +21,9 @@ Online Communities + + WebKit.org + xkcd diff --git a/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp b/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp index 8aeeb88..c80fe3a 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("qt-project.org/doc/qt-5.0"); + 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.digia.com"); -- cgit v1.2.3 From 92fde6d30180b261bfbd6c83429e88dbae4752f5 Mon Sep 17 00:00:00 2001 From: Frank Osterfeld Date: Thu, 12 Mar 2015 06:59:38 +0100 Subject: Fix incrementing tab count The typo raised the clang warning "use of unary operator that may be intended as compound assignment (+=)" Change-Id: I237c2182d097d9c726b50f0db3799e3a3f224299 Reviewed-by: Florian Bruhin Reviewed-by: Allan Sandfeld Jensen --- examples/webkitwidgets/browser/browserapplication.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/webkitwidgets/browser/browserapplication.cpp b/examples/webkitwidgets/browser/browserapplication.cpp index 05d277e..1c7ef63 100644 --- a/examples/webkitwidgets/browser/browserapplication.cpp +++ b/examples/webkitwidgets/browser/browserapplication.cpp @@ -201,7 +201,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) { -- cgit v1.2.3 From f5230ca1daad6923e4f307e82337bf93424b73a4 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 20 May 2015 13:26:23 +0200 Subject: Disambiguate name of QLocalServer used in Browser example. Append Qt version and engine name so that it does not lock out the QtWebEngine based browser and allows for comparing different versions of Qt. Change-Id: Id904d2760dbf44777327b6b21847caf35a811e59 Task-number: QTBUG-46233 Reviewed-by: Allan Sandfeld Jensen --- examples/webkitwidgets/browser/browserapplication.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/webkitwidgets/browser/browserapplication.cpp b/examples/webkitwidgets/browser/browserapplication.cpp index 1c7ef63..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)) { -- cgit v1.2.3