1 files changed, 3 insertions, 24 deletions

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index 943aeaa2d9..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
@@ -2804,7 +2783,7 @@ void QApplicationPrivate::sendSyntheticEnterLeave(QWidget *widget)
 */
 QDesktopWidget *QApplication::desktop()
 {
-    CHECK_QAPP_INSTANCE(Q_NULLPTR)
+    CHECK_QAPP_INSTANCE(nullptr)
     if (!qt_desktopWidget || // not created yet
          !(qt_desktopWidget->windowType() == Qt::Desktop)) { // reparented away
         qt_desktopWidget = new QDesktopWidget();
@@ -3284,7 +3263,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
                 // sequence, so we reset wheel_widget in case no one accepts the event
                 // or if we didn't get (or missed) a ScrollEnd previously.
                 if (spontaneous && phase == Qt::ScrollBegin)
-                    QApplicationPrivate::wheel_widget = Q_NULLPTR;
+                    QApplicationPrivate::wheel_widget = nullptr;
 
                 const QPoint &relpos = wheel->pos();
 
@@ -3334,7 +3313,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e)
                 d->notify_helper(QApplicationPrivate::wheel_widget, &we);
                 wheel->setAccepted(we.isAccepted());
                 if (phase == Qt::ScrollEnd)
-                    QApplicationPrivate::wheel_widget = Q_NULLPTR;
+                    QApplicationPrivate::wheel_widget = nullptr;
             }
         }
         break;