diff options
| author | Błażej Szczygieł <spaz16@wp.pl> | 2017-03-28 21:31:37 +0200 |
|---|---|---|
| committer | Błażej Szczygieł <spaz16@wp.pl> | 2017-03-30 07:05:31 +0000 |
| commit | 2fbc1432025dd478cf9e940e3c2a1952b218c6dc (patch) | |
| tree | 1afc8a446a95da2b990f0cf738802546a3bb442d /src/widgets/widgets | |
| parent | b3872572617789f1cb079452b675e532c19969a6 (diff) | |
QtWidgets: Fix white text color on tabs on macOS for non-macOS styles
Apply white text only for macOS style.
Amends 2c0033983bc53e906eab3f4b2fae836ff8472713
Task-number: QTBUG-59784
Change-Id: I9e66e929699efd715ed4565394f1aba763aeb32a
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/widgets/widgets')
| -rw-r--r-- | src/widgets/widgets/qtabbar.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/widgets/widgets/qtabbar.cpp b/src/widgets/widgets/qtabbar.cpp index 35d9498413..f14e63c584 100644 --- a/src/widgets/widgets/qtabbar.cpp +++ b/src/widgets/widgets/qtabbar.cpp @@ -176,12 +176,11 @@ void QTabBarPrivate::initBasicStyleOption(QStyleOptionTab *option, int tabIndex) if (tab.textColor.isValid()) option->palette.setColor(q->foregroundRole(), tab.textColor); -#ifdef Q_OS_MACOS - else if (isCurrent && !documentMode + else if (q->style()->inherits("QMacStyle") + && isCurrent && !documentMode && (QSysInfo::MacintoshVersion < QSysInfo::MV_10_10 || q->isActiveWindow())) { option->palette.setColor(QPalette::WindowText, Qt::white); } -#endif option->icon = tab.icon; option->iconSize = q->iconSize(); // Will get the default value then. |