diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-03-21 17:03:55 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-03-22 11:17:13 +0000 |
| commit | e7d03ea7aae172bb2ef5e89b89156f8ea143eca1 (patch) | |
| tree | 3dcb330fdd91dcfe6b63b85a059de0d95c250bc6 /src/quickcontrols2/qquickstyleattached.cpp | |
| parent | f7c0efb42bd7f8b331525b42ec16536c1b4862f9 (diff) | |
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 <mitch.curtis@qt.io>
Diffstat (limited to 'src/quickcontrols2/qquickstyleattached.cpp')
| -rw-r--r-- | src/quickcontrols2/qquickstyleattached.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/quickcontrols2/qquickstyleattached.cpp b/src/quickcontrols2/qquickstyleattached.cpp index fd02790f..8b87a6d0 100644 --- a/src/quickcontrols2/qquickstyleattached.cpp +++ b/src/quickcontrols2/qquickstyleattached.cpp @@ -36,33 +36,12 @@ #include "qquickstyleattached_p.h" -#include <QtGui/qcolor.h> -#include <QtGui/qpalette.h> -#include <QtGui/private/qguiapplication_p.h> -#include <QtGui/qpa/qplatformtheme.h> #include <QtQuick/qquickwindow.h> #include <QtQuick/private/qquickitem_p.h> #include <QtQuickTemplates2/private/qquickpopup_p.h> QT_BEGIN_NAMESPACE -static bool isDarkSystemTheme() -{ - if (const QPlatformTheme *theme = QGuiApplicationPrivate::platformTheme()) { - if (const QPalette *systemPalette = theme->palette(QPlatformTheme::SystemPalette)) { - const QColor textColor = systemPalette->color(QPalette::WindowText); - return textColor.red() > 128 && textColor.blue() > 128 && textColor.green() > 128; - } - } - return false; -} - -Q_QUICKCONTROLS2_PRIVATE_EXPORT bool qt_is_dark_system_theme() -{ - static bool dark = isDarkSystemTheme(); - return dark; -} - static QQuickStyleAttached *attachedStyle(const QMetaObject *type, QObject *object, bool create = false) { if (!object) |