From 8a78f43517a8d36c42caeedf3e529425bb000c21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Br=C3=BCning?= <michael.bruning@digia.com>
Date: Fri, 16 May 2014 17:33:26 +0200
Subject: [PATCH] Fix up tabbed browser code.
Change-Id: Ia1a92a7eb9b3568e8cb7ccf6c7056abba647fd8d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
---
examples/webenginewidgets/browser/browsermainwindow.cpp | 7 ++++---
examples/webenginewidgets/browser/tabwidget.cpp | 8 ++++----
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/examples/webenginewidgets/browser/browsermainwindow.cpp b/examples/webenginewidgets/browser/browsermainwindow.cpp
index 91096e8b9..da026edf7 100644
--- a/examples/webenginewidgets/browser/browsermainwindow.cpp
+++ b/examples/webenginewidgets/browser/browsermainwindow.cpp
@@ -638,10 +638,11 @@ void BrowserMainWindow::slotAboutApplication()
{
QMessageBox::about(this, tr("About"), tr(
"Version %1"
- "<p>This demo demonstrates Qt's "
- "webkit facilities in action, providing an example "
+ "<p>This demo demonstrates the facilities "
+ "of Qt WebEngine in action, providing an example "
"browser for you to experiment with.<p>"
- "<p>QtWebKit is based on the Open Source WebKit Project developed at <a href=\"http://webkit.org/\">http://webkit.org/</a>."
+ "<p>Qt WebEngine is based on the Chromium open source project "
+ "developed at <a href=\"http://www.chromium.org/\">http://www.chromium.org/</a>."
).arg(QCoreApplication::applicationVersion()));
}
diff --git a/examples/webenginewidgets/browser/tabwidget.cpp b/examples/webenginewidgets/browser/tabwidget.cpp
index efc7c438f..2503f4b8a 100644
--- a/examples/webenginewidgets/browser/tabwidget.cpp
+++ b/examples/webenginewidgets/browser/tabwidget.cpp
@@ -310,8 +310,8 @@ void TabWidget::currentChanged(int index)
disconnect(oldWebView, SIGNAL(statusBarMessage(QString)),
this, SIGNAL(showStatusBarMessage(QString)));
#endif
- disconnect(oldWebView->page(), SIGNAL(linkHovered(QString)),
- this, SIGNAL(linkHovered(QString)));
+ disconnect(oldWebView->page(), SIGNAL(linkHovered(const QString&)),
+ this, SIGNAL(linkHovered(const QString&)));
disconnect(oldWebView, SIGNAL(loadProgress(int)),
this, SIGNAL(loadProgress(int)));
}
@@ -320,8 +320,8 @@ void TabWidget::currentChanged(int index)
connect(webView, SIGNAL(statusBarMessage(QString)),
this, SIGNAL(showStatusBarMessage(QString)));
#endif
- connect(webView->page(), SIGNAL(linkHovered(QString)),
- this, SIGNAL(linkHovered(QString)));
+ connect(webView->page(), SIGNAL(linkHovered(const QString&)),
+ this, SIGNAL(linkHovered(const QString&)));
connect(webView, SIGNAL(loadProgress(int)),
this, SIGNAL(loadProgress(int)));
--
GitLab