Fix build for Qt4 by disabling the hack for unfocused QTreeView

FedoraQt · May 11, 2020 · 06cfac2 · 06cfac2
1 parent 1f38313
commit 06cfac2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/style/adwaitahelper.h b/style/adwaitahelper.h
@@ -29,7 +29,10 @@
 #include <QPainterPath>
 #include <QStyle>
 #include <QWidget>
+
+#if QT_VERSION > 0x050000
 #include <QWindow>
+#endif
 
 #if ADWAITA_HAVE_X11
 #include <QX11Info>
@@ -59,6 +62,7 @@ class Helper
     virtual ~Helper()
     {}
 
+#if QT_VERSION > 0x050000
     static bool isWindowActive(const QWidget *widget)
     {
         const QWindow *win = widget ? widget->window()->windowHandle() : nullptr;
@@ -67,6 +71,7 @@ class Helper
         }
         return false;
     }
+#endif
 
     //*@name color utilities
     //@{

diff --git a/style/adwaitastyle.cpp b/style/adwaitastyle.cpp
@@ -407,6 +407,7 @@ void Style::polish(QWidget *widget)
         }
     }
 
+#if QT_VERSION > 0x050000
     // HACK to avoid different text color in unfocused views
     if (QAbstractItemView *view = qobject_cast<QAbstractItemView *>(widget)) {
          QWindow *win = widget ? widget->window()->windowHandle() : nullptr;
@@ -427,6 +428,7 @@ void Style::polish(QWidget *widget)
         }
 
     }
+#endif
 
     if (!widget->parent() || !qobject_cast<QWidget *>(widget->parent()) || qobject_cast<QDialog *>(widget) || qobject_cast<QMainWindow *>(widget)) {
         addEventFilter(widget);
@@ -4617,12 +4619,13 @@ bool Style::drawItemViewItemControl(const QStyleOption *option, QPainter *painte
 #else
     QStyleOptionViewItemV4 op(*vopt);
 #endif
+#if QT_VERSION > 0x050000
     if (_helper->isWindowActive(widget)) {
         QPalette palette = op.palette;
         palette.setColor(QPalette::Inactive, QPalette::Text, palette.color(QPalette::Active, QPalette::Text));
         op.palette = palette;
     }
-
+#endif
     ParentStyleClass::drawControl(CE_ItemViewItem, &op, painter, widget);
 
     return true;