Merge pull request #10094 from Kolcha/pb-fix

Draw progress bar in Fusion style on macOS systems

src/gui/previewlistdelegate.h

@@ -36,7 +36,7 @@
 #include <QStyleOptionProgressBar>
 #include <QStyleOptionViewItem>
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
 #include <QProxyStyle>
 #endif
 
@@ -76,7 +76,7 @@ public:
                 newopt.minimum = 0;
                 newopt.state |= QStyle::State_Enabled;
                 newopt.textVisible = true;
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
                 QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
 #else
                 // XXX: To avoid having the progress text on the right of the bar

src/gui/properties/proplistdelegate.cpp

@@ -36,7 +36,7 @@
 #include <QProgressBar>
 #include <QStyleOptionProgressBar>
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
 #include <QProxyStyle>
 #endif
 
@@ -101,7 +101,7 @@ void PropListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
                 newopt.state |= QStyle::State_Enabled;
             }
 
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
             QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
 #else
             // XXX: To avoid having the progress text on the right of the bar

src/gui/transferlistdelegate.cpp

@@ -33,7 +33,7 @@
 #include <QPainter>
 #include <QStyleOptionViewItem>
 
-#ifdef Q_OS_WIN
+#if defined(Q_OS_WIN) || defined(Q_OS_MACOS)
 #include <QProxyStyle>
 #endif
 
@@ -166,7 +166,7 @@ void TransferListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
             newopt.minimum = 0;
             newopt.state |= QStyle::State_Enabled;
             newopt.textVisible = true;
-#ifndef Q_OS_WIN
+#if !defined(Q_OS_WIN) && !defined(Q_OS_MACOS)
             QApplication::style()->drawControl(QStyle::CE_ProgressBar, &newopt, painter);
 #else
             // XXX: To avoid having the progress text on the right of the bar