diff options
Diffstat (limited to 'src/plugins/styles/android')
| -rw-r--r-- | src/plugins/styles/android/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/plugins/styles/android/qandroidstyle.cpp | 8 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/plugins/styles/android/CMakeLists.txt b/src/plugins/styles/android/CMakeLists.txt index b89693c122..b8bda6fd5f 100644 --- a/src/plugins/styles/android/CMakeLists.txt +++ b/src/plugins/styles/android/CMakeLists.txt @@ -1,7 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -# Generated from android.pro. +# SPDX-License-Identifier: BSD-3-Clause ##################################################################### ## QAndroidStylePlugin Plugin: @@ -18,6 +16,3 @@ qt_internal_add_plugin(QAndroidStylePlugin Qt::Gui Qt::WidgetsPrivate ) - -#### Keys ignored in scope 1:.:.:android.pro:<TRUE>: -# DISTFILES = "androidstyle.json" diff --git a/src/plugins/styles/android/qandroidstyle.cpp b/src/plugins/styles/android/qandroidstyle.cpp index 5acdb07520..64940ed4d8 100644 --- a/src/plugins/styles/android/qandroidstyle.cpp +++ b/src/plugins/styles/android/qandroidstyle.cpp @@ -1134,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; } @@ -1209,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"); @@ -1259,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(); } @@ -1285,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; } |