diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-05-16 17:33:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-19 16:59:11 +0200 |
| commit | 8a78f43517a8d36c42caeedf3e529425bb000c21 (patch) | |
| tree | eb620450315740346e57c76d5fe980ac3abfbf02 /examples/webenginewidgets | |
| parent | 52bba25402541506c495c28774386317f8f78cbf (diff) | |
Fix up tabbed browser code.
Change-Id: Ia1a92a7eb9b3568e8cb7ccf6c7056abba647fd8d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'examples/webenginewidgets')
| -rw-r--r-- | examples/webenginewidgets/browser/browsermainwindow.cpp | 7 | ||||
| -rw-r--r-- | 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))); |