diff options
| author | Kai Koehne <kai.koehne@qt.io> | 2017-09-28 09:25:50 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2017-10-10 18:51:53 +0000 |
| commit | 80173d04b2f93a236dc8ad406836c241048cd2cf (patch) | |
| tree | 85125254d7afd4fd91efa966a18339284fc61bd2 | |
| parent | 2b56fc9a6a57e5b7bd26e4f42fe13f1f71be2f71 (diff) | |
Use printf style qDebug5.6
This generates more compact code. It also fixes a build issue with
some disabled features on macOS.
Task-number: QTBUG-63440
Change-Id: Ice800bdfef09dd83310d40cadd37c15c846ca3e1
Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
(cherry picked from commit 3bcd4c3506c9352874f1403aba22e36108a867a2)
| -rw-r--r-- | src/webview/qquickviewcontroller.cpp | 3 | ||||
| -rw-r--r-- | src/webview/qquickwebview.cpp | 4 | ||||
| -rw-r--r-- | src/webview/qwebview_android.cpp | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/src/webview/qquickviewcontroller.cpp b/src/webview/qquickviewcontroller.cpp index 56b169b..73f7a13 100644 --- a/src/webview/qquickviewcontroller.cpp +++ b/src/webview/qquickviewcontroller.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 <QtGui/QWindow> #include <QtQuick/QQuickWindow> -#include <QtCore/QDebug> #include <QtQuick/qquickrendercontrol.h> #include <QtQuick/private/qquickitem_p.h> diff --git a/src/webview/qquickwebview.cpp b/src/webview/qquickwebview.cpp index d760564..46e8758 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. @@ -302,7 +302,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; } diff --git a/src/webview/qwebview_android.cpp b/src/webview/qwebview_android.cpp index 1783deb..cec395d 100644 --- a/src/webview/qwebview_android.cpp +++ b/src/webview/qwebview_android.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. @@ -187,7 +187,7 @@ void QAndroidWebViewPrivate::runJavaScriptPrivate(const QString &script, int callbackId) { if (QtAndroidPrivate::androidSdkVersion() < 19) { - qWarning() << "runJavaScript() requires API level 19 or higher."; + qWarning("runJavaScript() requires API level 19 or higher."); if (callbackId == -1) return; |