1 files changed, 8 insertions, 42 deletions

diff --git a/src/webenginequick/api/qquickwebenginefaviconprovider.cpp b/src/webenginequick/api/qquickwebenginefaviconprovider.cpp
index 2a335418c..56bbb97ac 100644
--- a/src/webenginequick/api/qquickwebenginefaviconprovider.cpp
+++ b/src/webenginequick/api/qquickwebenginefaviconprovider.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2021 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWebEngine module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** 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 https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2021 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qquickwebenginefaviconprovider_p_p.h"
 
@@ -71,9 +35,9 @@ static QSize largestSize(const QList<QSize> &availableSizes)
 
 static QSize fitSize(const QList<QSize> &availableSizes, const QSize &requestedSize)
 {
-    Q_ASSERT(availableSizes.count());
+    Q_ASSERT(availableSizes.size());
     QSize result = largestSize(availableSizes);
-    if (availableSizes.count() == 1 || area(requestedSize) >= area(result))
+    if (availableSizes.size() == 1 || area(requestedSize) >= area(result))
         return result;
 
     for (const QSize &size : availableSizes) {
@@ -181,7 +145,7 @@ void FaviconImageResponseRunnable::requestIconOnUIThread(QQuickWebEngineView *vi
     QTimer *timer = new QTimer();
     timer->moveToThread(qApp->thread());
     timer->setSingleShot(true);
-    QObject::connect(timer, &QTimer::timeout, [=]() {
+    QObject::connect(timer, &QTimer::timeout, [this, view, timer]() {
         QtWebEngineCore::ProfileAdapter *profileAdapter = view->d_ptr->profileAdapter();
         bool touchIconsEnabled = view->profile()->settings()->touchIconsEnabled();
         if (isIconURL(QUrl(m_id))) {
@@ -212,7 +176,7 @@ FaviconImageResponse::FaviconImageResponse(const QString &id, const QSize &reque
         QTimer *timer = new QTimer();
         timer->moveToThread(qApp->thread());
         timer->setSingleShot(true);
-        QObject::connect(timer, &QTimer::timeout, [=]() {
+        QObject::connect(timer, &QTimer::timeout, [this, id, requestedSize, views, pool, view, timer]() {
             QIcon icon = view->d_ptr->adapter->icon();
             if (icon.isNull())
                 startRunnable(id, requestedSize, views, pool);
@@ -289,3 +253,5 @@ QQuickWebEngineFaviconProvider::requestImageResponse(const QString &id, const QS
 }
 
 QT_END_NAMESPACE
+
+#include "moc_qquickwebenginefaviconprovider_p_p.cpp"