Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4

 Conflicts:
	.qmake.conf

Change-Id: I417d10ac2bbd1da3e06946c3781b942548cfafbe

1 files changed, 2 insertions, 3 deletions

diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp
index a486088..eb0727a 100644
--- a/src/webview/qquickwebview.cpp
+++ b/src/webview/qquickwebview.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
+** Copyright (C) 2017 The Qt Company Ltd.
 ** Contact: http://www.qt.io/licensing/
 **
 ** This file is part of the QtWebView module of the Qt Toolkit.
@@ -39,7 +39,6 @@
 #include <QtWebView/private/qwebviewloadrequest_p.h>
 #include <QtQml/qqmlengine.h>
 #include <QtCore/qmutex.h>
-#include <QtCore/QDebug>
 
 namespace {
 
@@ -311,7 +310,7 @@ void QQuickWebView::onRunJavaScriptResult(int id, const QVariant &variant)
 
     QQmlEngine *engine = qmlEngine(this);
     if (engine == 0) {
-        qWarning() << "No JavaScript engine, unable to handle JavaScript callback!";
+        qWarning("No JavaScript engine, unable to handle JavaScript callback!");
         return;
     }