2 files changed, 10 insertions, 8 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 9499c88af12..bd2b5be11aa 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -32,7 +32,7 @@
 #include "private/qwidgetwindow_p.h"
 #include "qpainter.h"
 #if QT_CONFIG(tooltip)
-#include "qtooltip.h"
+#include "private/qtooltip_p.h"
 #endif
 #if QT_CONFIG(whatsthis)
 #include "qwhatsthis.h"
@@ -1435,7 +1435,9 @@ void QWidgetPrivate::createTLSysExtra()
         if (extra->topextra->opacity != 255 && q->isWindow())
             extra->topextra->window->setOpacity(qreal(extra->topextra->opacity) / qreal(255));
 
-        const bool isTipLabel = q->inherits("QTipLabel");
+#if QT_CONFIG(tooltip)
+        const bool isTipLabel = qobject_cast<const QTipLabel *>(q) != nullptr;
+#endif
         const bool isAlphaWidget = !isTipLabel && q->inherits("QAlphaWidget");
 #ifdef Q_OS_WIN
         // Pass on native parent handle for Widget embedded into Active X.
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 25b048db65e..e0fdd56e6d8 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -35,7 +35,7 @@
 #include <qabstractscrollarea.h>
 #include "private/qabstractscrollarea_p.h"
 #if QT_CONFIG(tooltip)
-#include <qtooltip.h>
+#include "private/qtooltip_p.h"
 #endif
 #include <qshareddata.h>
 #if QT_CONFIG(toolbutton)
@@ -950,7 +950,7 @@ QRenderRule::QRenderRule(const QList<Declaration> &declarations, const QObject *
     hasFont = v.extractFont(&font, &adj);
 
 #if QT_CONFIG(tooltip)
-    if (object && qstrcmp(object->metaObject()->className(), "QTipLabel") == 0)
+    if (qobject_cast<const QTipLabel *>(object) != nullptr)
         palette = QToolTip::palette();
 #endif
 
@@ -1495,7 +1495,7 @@ bool QRenderRule::hasModification() const
 static inline QObject *parentObject(const QObject *obj)
 {
 #if QT_CONFIG(tooltip)
-    if (qobject_cast<const QLabel *>(obj) && qstrcmp(obj->metaObject()->className(), "QTipLabel") == 0) {
+    if (qobject_cast<const QTipLabel *>(obj) != nullptr) {
         QObject *p = qvariant_cast<QObject *>(obj->property("_q_stylesheet_parent"));
         if (p)
             return p;
@@ -1515,7 +1515,7 @@ public:
             return QStringList();
         const QMetaObject *metaObject = OBJECT_PTR(node)->metaObject();
 #if QT_CONFIG(tooltip)
-        if (qstrcmp(metaObject->className(), "QTipLabel") == 0)
+        if (metaObject == &QTipLabel::staticMetaObject)
             return QStringList("QToolTip"_L1);
 #endif
         QStringList result;
@@ -1581,7 +1581,7 @@ public:
             return false;
         const QMetaObject *metaObject = OBJECT_PTR(node)->metaObject();
 #if QT_CONFIG(tooltip)
-        if (qstrcmp(metaObject->className(), "QTipLabel") == 0)
+        if (metaObject == &QTipLabel::staticMetaObject)
             return nodeName == "QToolTip"_L1;
 #endif
         do {
@@ -1747,7 +1747,7 @@ int QStyleSheetStyle::nativeFrameWidth(const QWidget *w)
     }
 #endif
 
-    if (qstrcmp(w->metaObject()->className(), "QTipLabel") == 0)
+    if (w->metaObject() == &QTipLabel::staticMetaObject)
         return base->pixelMetric(QStyle::PM_ToolTipLabelFrameWidth, nullptr, w);
 
     return base->pixelMetric(QStyle::PM_DefaultFrameWidth, nullptr, w);