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.cpp | 21 --------------------- src/widgets/kernel/qapplication_p.h | 7 ------- 2 files changed, 28 deletions(-) diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 93e2db4b1a..e336c5f06d 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -152,20 +152,6 @@ static void clearSystemPalette() QApplicationPrivate::sys_pal = 0; } -static QByteArray get_style_class_name() -{ - QScopedPointer s(QStyleFactory::create(QApplicationPrivate::desktopStyleKey())); - if (!s.isNull()) - return s->metaObject()->className(); - return QByteArray(); -} - -static QByteArray nativeStyleClassName() -{ - static QByteArray name = get_style_class_name(); - return name; -} - bool QApplicationPrivate::autoSipEnabled = true; QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, int flags) @@ -395,8 +381,6 @@ void qt_init_tooltip_palette(); void qt_cleanup(); QStyle *QApplicationPrivate::app_style = 0; // default application style -bool QApplicationPrivate::overrides_native_style = false; // whether native QApplication style is - // overridden, i.e. not native #ifndef QT_NO_STYLE_STYLESHEET QString QApplicationPrivate::styleSheet; // default application stylesheet #endif @@ -1091,8 +1075,6 @@ QStyle *QApplication::style() Q_ASSERT(!"No styles available!"); return 0; } - QApplicationPrivate::overrides_native_style = - app_style->objectName() != QApplicationPrivate::desktopStyleKey(); } // take ownership of the style QApplicationPrivate::app_style->setParent(qApp); @@ -1157,9 +1139,6 @@ void QApplication::setStyle(QStyle *style) QStyle *old = QApplicationPrivate::app_style; // save - QApplicationPrivate::overrides_native_style = - nativeStyleClassName() == QByteArray(style->metaObject()->className()); - #ifndef QT_NO_STYLE_STYLESHEET if (!QApplicationPrivate::styleSheet.isEmpty() && !qobject_cast(style)) { // we have a stylesheet already and a new style is being set 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