diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:56 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:18:56 +0100 |
commit | bb8e59fb05f8c772135229a26c76b785db9adf61 (patch) | |
tree | 66022e7f760a0a50b5fddaa28e90f1db905701dd /src | |
parent | a379e86fe5e37f3cac77ae135df2ffb5c7f9ae3e (diff) | |
parent | 177956a5e25eae1efd9a31f8ababff473a7d592f (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Ic55966368182eec8ac9712ef6c69926a65d17e94
Diffstat (limited to 'src')
-rw-r--r-- | src/webview/doc/src/qtwebview-examples.qdoc | 10 | ||||
-rw-r--r-- | src/webview/doc/src/qtwebview-module.qdoc | 10 | ||||
-rw-r--r-- | src/webview/doc/src/qtwebview-overview.qdoc | 10 | ||||
-rw-r--r-- | src/webview/doc/src/qtwebview-qmltypes.qdoc | 10 | ||||
-rw-r--r-- | src/webview/qquickviewcontroller.cpp | 3 | ||||
-rw-r--r-- | src/webview/qquickwebview.cpp | 5 | ||||
-rw-r--r-- | src/webview/qwebview_android.cpp | 4 |
7 files changed, 25 insertions, 27 deletions
diff --git a/src/webview/doc/src/qtwebview-examples.qdoc b/src/webview/doc/src/qtwebview-examples.qdoc index c845db6..38b34ed 100644 --- a/src/webview/doc/src/qtwebview-examples.qdoc +++ b/src/webview/doc/src/qtwebview-examples.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/webview/doc/src/qtwebview-module.qdoc b/src/webview/doc/src/qtwebview-module.qdoc index 7927d2b..52917bc 100644 --- a/src/webview/doc/src/qtwebview-module.qdoc +++ b/src/webview/doc/src/qtwebview-module.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/webview/doc/src/qtwebview-overview.qdoc b/src/webview/doc/src/qtwebview-overview.qdoc index 2235885..afb47ce 100644 --- a/src/webview/doc/src/qtwebview-overview.qdoc +++ b/src/webview/doc/src/qtwebview-overview.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/webview/doc/src/qtwebview-qmltypes.qdoc b/src/webview/doc/src/qtwebview-qmltypes.qdoc index ae39d1d..2fe1ca1 100644 --- a/src/webview/doc/src/qtwebview-qmltypes.qdoc +++ b/src/webview/doc/src/qtwebview-qmltypes.qdoc @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ +** Copyright (C) 2017 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -11,8 +11,8 @@ ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. ** ** GNU Free Documentation License Usage ** Alternatively, this file may be used under the terms of the GNU Free @@ -20,7 +20,7 @@ ** Foundation and appearing in the file included in the packaging of ** this file. Please review the following information to ensure ** the GNU Free Documentation License version 1.3 requirements -** will be met: http://www.gnu.org/copyleft/fdl.html. +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. ** $QT_END_LICENSE$ ** ****************************************************************************/ diff --git a/src/webview/qquickviewcontroller.cpp b/src/webview/qquickviewcontroller.cpp index 0410196..1b6d283 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 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; } 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; |