diff options
Diffstat (limited to 'src/quickcontrols')
4 files changed, 9 insertions, 3 deletions
diff --git a/src/quickcontrols/doc/src/qtquickcontrols-universal.qdoc b/src/quickcontrols/doc/src/qtquickcontrols-universal.qdoc index 3268b5b11a..871acdf40d 100644 --- a/src/quickcontrols/doc/src/qtquickcontrols-universal.qdoc +++ b/src/quickcontrols/doc/src/qtquickcontrols-universal.qdoc @@ -208,6 +208,8 @@ \image qtquickcontrols-universal-foreground.png \endtable + \endstyleproperty + \styleproperty {Universal.theme} {enumeration} {universal-theme-attached-prop} \target universal-theme-attached-prop This attached property holds whether the theme is light or dark. The property diff --git a/src/quickcontrols/macos/qtquickcontrols2macosstyleplugin.cpp b/src/quickcontrols/macos/qtquickcontrols2macosstyleplugin.cpp index ec67ffa4dc..6b1c12fdab 100644 --- a/src/quickcontrols/macos/qtquickcontrols2macosstyleplugin.cpp +++ b/src/quickcontrols/macos/qtquickcontrols2macosstyleplugin.cpp @@ -4,6 +4,7 @@ #include <QtQml/qqml.h> #include <QtQuickControls2/private/qquickstyleplugin_p.h> #include <QtQuickControls2/qquickstyle.h> +#include <private/qquicktheme_p.h> QT_BEGIN_NAMESPACE @@ -34,8 +35,10 @@ QString QtQuickControls2MacOSStylePlugin::name() const return QStringLiteral("macOS"); } -void QtQuickControls2MacOSStylePlugin::initializeTheme(QQuickTheme */*theme*/) +void QtQuickControls2MacOSStylePlugin::initializeTheme(QQuickTheme *theme) { + Q_ASSERT(theme); + theme->setUsePlatformPalette(true); } QT_END_NAMESPACE diff --git a/src/quickcontrols/material/qt_attribution.json b/src/quickcontrols/material/qt_attribution.json index 9d53b8b014..38f7bac6e7 100644 --- a/src/quickcontrols/material/qt_attribution.json +++ b/src/quickcontrols/material/qt_attribution.json @@ -6,6 +6,7 @@ "Files": "impl/ElevationEffect.qml", "Description": "Shadow values for the elevation effect.", "Homepage": "https://angularjs.org/", + "Comment": "no relevant PURL or CPE set, because the dependency is a single file", "License": "MIT License", "LicenseId": "MIT", "LicenseFile": "LICENSE_ANGULARJS.txt", diff --git a/src/quickcontrols/qquickattachedpropertypropagator.cpp b/src/quickcontrols/qquickattachedpropertypropagator.cpp index 892d347809..57ea1fc782 100644 --- a/src/quickcontrols/qquickattachedpropertypropagator.cpp +++ b/src/quickcontrols/qquickattachedpropertypropagator.cpp @@ -98,7 +98,7 @@ static QQuickAttachedPropertyPropagator *findAttachedParent(const QMetaObject *o */ auto popupItem = qobject_cast<QQuickPopupItem *>(objectWeAreAttachedTo); if (popupItem) { - qCDebug(lcAttached).noquote() << "- attachee belongs to popup item" << popupItem << "- checking if it has an attached object"; + qCDebug(lcAttached).noquote() << "- attachee is a popup item" << popupItem << "- checking if it has an attached object"; auto popupItemPrivate = QQuickPopupItemPrivate::get(popupItem); QQuickAttachedPropertyPropagator *popupAttached = attachedObject(ourAttachedType, popupItemPrivate->popup); if (popupAttached) { @@ -108,7 +108,7 @@ static QQuickAttachedPropertyPropagator *findAttachedParent(const QMetaObject *o qCDebug(lcAttached).noquote() << "- popup item does not have attached object"; } } else { - qCDebug(lcAttached).noquote() << "- attachee does not belong to a popup"; + qCDebug(lcAttached).noquote() << "- attachee is not a popup item"; } QQuickItem *item = qobject_cast<QQuickItem *>(objectWeAreAttachedTo); |