diff options
Diffstat (limited to 'src/widgets/kernel/qapplication.cpp')
-rw-r--r-- | src/widgets/kernel/qapplication.cpp | 21 |
1 files changed, 0 insertions, 21 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<QStyle> 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<QStyleSheetStyle *>(style)) { // we have a stylesheet already and a new style is being set |