diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-02-28 18:31:11 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-28 19:22:05 +0100 |
| commit | 0520631b2ba04fb99d3d46385f04279cd89a7732 (patch) | |
| tree | c970fab36c889741dedcb708e520fe9ec517fc07 /src/widgets/styles | |
| parent | 439002cddeb32766ea9806ac8b5cf9a973ed0f13 (diff) | |
| parent | 70d5cb406fda70d175faac5f9588f0e345588c56 (diff) | |
Merge "Merge branch 'ios' into dev" into refs/staging/dev
Diffstat (limited to 'src/widgets/styles')
| -rw-r--r-- | src/widgets/styles/qfusionstyle_p_p.h | 4 | ||||
| -rw-r--r-- | src/widgets/styles/qstyleoption.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/styles/qfusionstyle_p_p.h b/src/widgets/styles/qfusionstyle_p_p.h index d3f2ff5f40..58595fe889 100644 --- a/src/widgets/styles/qfusionstyle_p_p.h +++ b/src/widgets/styles/qfusionstyle_p_p.h @@ -88,9 +88,9 @@ public: // On mac we want a standard blue color used when the system palette is used bool isMacSystemPalette(const QPalette &pal) const { Q_UNUSED(pal); -#ifdef Q_OS_MAC +#if defined(Q_OS_MAC) && !defined(Q_OS_IOS) const QPalette *themePalette = QGuiApplicationPrivate::platformTheme()->palette(); - if (themePalette->color(QPalette::Normal, QPalette::Highlight) == + if (themePalette && themePalette->color(QPalette::Normal, QPalette::Highlight) == pal.color(QPalette::Normal, QPalette::Highlight) && themePalette->color(QPalette::Normal, QPalette::HighlightedText) == pal.color(QPalette::Normal, QPalette::HighlightedText)) diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp index 01e51d594d..eff6837c5a 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -206,7 +206,7 @@ void QStyleOption::init(const QWidget *widget) if (!(state & QStyle::State_Active) && !qt_mac_can_clickThrough(widget)) state &= ~QStyle::State_Enabled; #endif -#ifdef Q_OS_MAC +#if defined(Q_OS_MAC) && !defined(Q_OS_IOS) switch (QMacStyle::widgetSizePolicy(widget)) { case QMacStyle::SizeSmall: state |= QStyle::State_Small; |