diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-20 21:22:53 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-20 21:22:53 +0200 |
| commit | 6f45fda50b6dbb0704a71a15f38d44027b4b1816 (patch) | |
| tree | 6a1c511cf233f1723c2b1758647f06c3bdaca7fb /src/plugins/platforms/cocoa/qcocoasystemsettings.mm | |
| parent | 7ee44dcb9c5c4ffaba0043d7d58e0d43ccc06195 (diff) | |
| parent | ab6cc41968ec6eedd16e4305cf38ef937b2a8d56 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I0bea38585382b5d9c8d7a013bf6bcb3a6008d159
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoasystemsettings.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoasystemsettings.mm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm index 1aa7b188a6..65a9a214a2 100644 --- a/src/plugins/platforms/cocoa/qcocoasystemsettings.mm +++ b/src/plugins/platforms/cocoa/qcocoasystemsettings.mm @@ -90,7 +90,9 @@ QPalette * qt_mac_createSystemPalette() palette->setColor(QPalette::Disabled, QPalette::Text, qc); palette->setColor(QPalette::Disabled, QPalette::WindowText, qc); palette->setColor(QPalette::Disabled, QPalette::HighlightedText, qc); - palette->setBrush(QPalette::ToolTipBase, QColor(255, 255, 199)); + + palette->setBrush(QPalette::ToolTipBase, qt_mac_toQBrush([NSColor controlColor])); + return palette; } |