1 files changed, 16 insertions, 48 deletions

diff --git a/src/plugins/styles/android/qandroidstyle.cpp b/src/plugins/styles/android/qandroidstyle.cpp
index 8036655b04..64940ed4d8 100644
--- a/src/plugins/styles/android/qandroidstyle.cpp
+++ b/src/plugins/styles/android/qandroidstyle.cpp
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 BogDan Vatra <bogdan@kde.org>
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtWidgets 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) 2013 BogDan Vatra <bogdan@kde.org>
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #include "qandroidstyle_p.h"
 
@@ -607,7 +571,7 @@ QSize QAndroidStyle::sizeFromContents(ContentsType ct,
             if (qApp->styleSheet().isEmpty())
                 txt = hdr->fontMetrics.size(0, hdr->text);
             else
-                txt = qApp->fontMetrics().size(0, hdr->text);
+                txt = QFontMetrics(QApplication::font()).size(0, hdr->text);
 
             sz.setHeight(margin + qMax(iconSize, txt.height()) + margin);
             sz.setWidth((nullIcon ? 0 : margin) + iconSize
@@ -677,6 +641,9 @@ int QAndroidStyle::styleHint(QStyle::StyleHint hint, const QStyleOption *option,
     case SH_RequestSoftwareInputPanel:
         return RSIP_OnMouseClick;
 
+    case SH_SpinBox_SelectOnStep:
+        return 0;
+
     default:
         return QFusionStyle::styleHint(hint, option, widget, returnData);
     }
@@ -1167,7 +1134,7 @@ QAndroidStyle::AndroidStateDrawable::AndroidStateDrawable(const QVariantMap &dra
 
 QAndroidStyle::AndroidStateDrawable::~AndroidStateDrawable()
 {
-    for (const StateType &type : qAsConst(m_states))
+    for (const StateType &type : std::as_const(m_states))
         delete type.second;
 }
 
@@ -1193,7 +1160,7 @@ QSize QAndroidStyle::AndroidStateDrawable::sizeImage(const QStyleOption *opt) co
 
 const QAndroidStyle::AndroidDrawable * QAndroidStyle::AndroidStateDrawable::bestAndroidStateMatch(const QStyleOption *opt) const
 {
-    const AndroidDrawable *bestMatch = 0;
+    const AndroidDrawable *bestMatch = nullptr;
     if (!opt) {
         if (m_states.size())
             return m_states[0].second;
@@ -1242,7 +1209,7 @@ const QAndroidStyle::AndroidDrawable * QAndroidStyle::AndroidStateDrawable::best
 
 int QAndroidStyle::AndroidStateDrawable::extractState(const QVariantMap &value)
 {
-    QStyle::State state = QStyle::State_Enabled | QStyle::State_Active;;
+    QStyle::State state = QStyle::State_Enabled | QStyle::State_Active;
     for (auto it = value.cbegin(), end = value.cend(); it != end; ++it) {
         const QString &key = it.key();
         bool val = it.value().toString() == QLatin1String("true");
@@ -1292,7 +1259,7 @@ int QAndroidStyle::AndroidStateDrawable::extractState(const QVariantMap &value)
 
 void QAndroidStyle::AndroidStateDrawable::setPaddingLeftToSizeWidth()
 {
-    for (const StateType &type : qAsConst(m_states))
+    for (const StateType &type : std::as_const(m_states))
         const_cast<AndroidDrawable *>(type.second)->setPaddingLeftToSizeWidth();
 }
 
@@ -1318,7 +1285,7 @@ QAndroidStyle::AndroidLayerDrawable::AndroidLayerDrawable(const QVariantMap &dra
 
 QAndroidStyle::AndroidLayerDrawable::~AndroidLayerDrawable()
 {
-    for (const LayerType &layer : qAsConst(m_layers))
+    for (const LayerType &layer : std::as_const(m_layers))
         delete layer.second;
 }
 
@@ -1352,9 +1319,10 @@ void QAndroidStyle::AndroidLayerDrawable::draw(QPainter *painter, const QStyleOp
 
 QAndroidStyle::AndroidDrawable *QAndroidStyle::AndroidLayerDrawable::layer(int id) const
 {
-    for (const LayerType &layer : m_layers)
+    for (const LayerType &layer : m_layers) {
         if (layer.first == id)
             return layer.second;
+    }
     return 0;
 }
 
@@ -1407,7 +1375,7 @@ void QAndroidStyle::AndroidControl::drawControl(const QStyleOption *opt, QPainte
                 qDrawShadePanel(p, frame->rect, frame->palette, frame->state & State_Sunken,
                                 frame->lineWidth);
             } else {
-                qDrawPlainRect(p, frame->rect, frame->palette.foreground().color(), frame->lineWidth);
+                qDrawPlainRect(p, frame->rect, frame->palette.windowText().color(), frame->lineWidth);
             }
         } else {
             if (const QStyleOptionFocusRect *fropt = qstyleoption_cast<const QStyleOptionFocusRect *>(opt)) {
@@ -1421,13 +1389,13 @@ void QAndroidStyle::AndroidControl::drawControl(const QStyleOption *opt, QPainte
                     else
                         p->setPen(Qt::white);
                 } else {
-                    p->setPen(opt->palette.foreground().color());
+                    p->setPen(opt->palette.windowText().color());
                 }
                 QRect focusRect = opt->rect.adjusted(1, 1, -1, -1);
                 p->drawRect(focusRect.adjusted(0, 0, -1, -1)); //draw pen inclusive
                 p->setPen(oldPen);
             } else {
-                p->fillRect(opt->rect, opt->palette.brush(QPalette::Background));
+                p->fillRect(opt->rect, opt->palette.window());
             }
         }
     }