From 7c7a95cd09fe8e4943bafad459b9f7870c36e0e8 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Fri, 17 Nov 2017 14:36:39 +0300 Subject: 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 --- src/widgets/kernel/qapplication_p.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'src/widgets/kernel/qapplication_p.h') 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; -- cgit v1.2.3