From e7d03ea7aae172bb2ef5e89b89156f8ea143eca1 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 21 Mar 2017 17:03:55 +0100 Subject: Move isDarkTheme() to QQuickStylePrivate QQuickStyleAttached is being generalized to a recursive attached object type that can be used for palettes too, which are planned to be used for the upcoming image-based style. Change-Id: I4c1d25624ee11bb0ec6cd5ee2656c36e622e2139 Reviewed-by: Mitch Curtis --- src/imports/controls/universal/qquickuniversalstyle.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/imports/controls/universal/qquickuniversalstyle.cpp') diff --git a/src/imports/controls/universal/qquickuniversalstyle.cpp b/src/imports/controls/universal/qquickuniversalstyle.cpp index 7257683c..8afb4e29 100644 --- a/src/imports/controls/universal/qquickuniversalstyle.cpp +++ b/src/imports/controls/universal/qquickuniversalstyle.cpp @@ -132,12 +132,10 @@ static QRgb qquickuniversal_accent_color(QQuickUniversalStyle::Color accent) return colors[accent]; } -extern bool qt_is_dark_system_theme(); - static QQuickUniversalStyle::Theme qquickuniversal_effective_theme(QQuickUniversalStyle::Theme theme) { if (theme == QQuickUniversalStyle::System) - theme = qt_is_dark_system_theme() ? QQuickUniversalStyle::Dark : QQuickUniversalStyle::Light; + theme = QQuickStylePrivate::isDarkSystemTheme() ? QQuickUniversalStyle::Dark : QQuickUniversalStyle::Light; return theme; } -- cgit v1.2.3