diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-11-17 14:36:39 +0300 |
---|---|---|
committer | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-12-01 19:29:29 +0000 |
commit | 7c7a95cd09fe8e4943bafad459b9f7870c36e0e8 (patch) | |
tree | dabb5290a8e503e7543bd330c295c2251d7068b9 /src/widgets/kernel/qapplication_p.h | |
parent | a6b7447058f42e9b592644b85e37b5705e6aa675 (diff) |
Revert "QApp: Method to check for native style usage."
This reverts commit 958a4c9087e03502d0173735df4611a7f96a0463.
QApplicationPrivate::usesNativeStyle() introduced by that commit
was never used. We have an untested method that is furthermore
may return wrong results because it relies on the comparison
'app_style->objectName() != QApplicationPrivate::desktopStyleKey()',
but not all styles set their object names.
Conflicts:
src/widgets/kernel/qapplication.cpp
src/widgets/kernel/qapplication_p.h
Change-Id: I48d221f9387381db9ed51a7a068bfd0a0c2ed58d
Reviewed-by: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Diffstat (limited to 'src/widgets/kernel/qapplication_p.h')
-rw-r--r-- | src/widgets/kernel/qapplication_p.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index e83d6e5820..9983cc7d9e 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -137,12 +137,6 @@ public: bool canQuit(); #endif - //style - static bool usesNativeStyle() - { - return !overrides_native_style; - } - bool notify_helper(QObject *receiver, QEvent * e); void init( @@ -178,7 +172,6 @@ public: static QSize app_strut; static QWidgetList *popupWidgets; static QStyle *app_style; - static bool overrides_native_style; static QPalette *sys_pal; static QPalette *set_pal; |