Improve interaction between QPlatformTheme and QPlatformIntegration hinting.
authorMichael Brasser <michael.brasser@live.com>
Thu, 7 Nov 2013 01:32:45 +0000 (19:32 -0600)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 15 Nov 2013 18:05:27 +0000 (19:05 +0100)
commit42aacbf5eb0f43556be500d52fbbce106f32b049
treec2a2896d2ef132e0d20f4f06e3f93ab8bd92d9f8
parentf59e29d9bfab2863b29769e318ae96f4640bd768
Improve interaction between QPlatformTheme and QPlatformIntegration hinting.

Ensure that custom style hints returned by subclassed
QPlatformIntegration::styleHints() are used if not explicitly overridden
by subclassed QPlatformTheme::themHints().

Task-number: QTBUG-34589
Change-Id: I0a3114cb00b532d2a5cd40941eca192b32412bcf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
src/gui/kernel/qplatformtheme.cpp