Selaa lähdekoodia

Revert "UI: Add workaround for Qt tooltip stylesheet bug"

No longer required as this was fixed in Qt 6.5.3.

This reverts commit d97950445e57a62459f4d5de2a6c8d43b5f61c66.
derrod 2 vuotta sitten
vanhempi
sitoutus
5dda04ad5e
2 muutettua tiedostoa jossa 0 lisäystä ja 22 poistoa
  1. 0 14
      UI/obs-proxy-style.cpp
  2. 0 8
      UI/obs-proxy-style.hpp

+ 0 - 14
UI/obs-proxy-style.cpp

@@ -90,17 +90,3 @@ int OBSProxyStyle::styleHint(StyleHint hint, const QStyleOption *option,
 
 	return QProxyStyle::styleHint(hint, option, widget, returnData);
 }
-
-#ifdef QT_TOOLTIP_WORKAROUND_NEEDED
-void OBSProxyStyle::polish(QWidget *widget)
-{
-	QProxyStyle::polish(widget);
-
-	// QTBUG-115511 workaround to make tooltip label QSS work again
-	if (widget->inherits("QTipLabel")) {
-		QPalette palette = widget->palette();
-		palette.setResolveMask(0);
-		widget->setPalette(palette);
-	}
-}
-#endif

+ 0 - 8
UI/obs-proxy-style.hpp

@@ -2,19 +2,11 @@
 
 #include <QProxyStyle>
 
-#if defined(_WIN32) && QT_VERSION == QT_VERSION_CHECK(6, 5, 2)
-#define QT_TOOLTIP_WORKAROUND_NEEDED
-#endif
-
 class OBSProxyStyle : public QProxyStyle {
 public:
 	int styleHint(StyleHint hint, const QStyleOption *option,
 		      const QWidget *widget,
 		      QStyleHintReturn *returnData) const override;
-
-#ifdef QT_TOOLTIP_WORKAROUND_NEEDED
-	void polish(QWidget *widget) override;
-#endif
 };
 
 class OBSContextBarProxyStyle : public OBSProxyStyle {