diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-20 19:23:14 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-04-20 20:06:18 +0000 |
| commit | 100ebf1c97dec1fcfea29d790c07993d071cbb3f (patch) | |
| tree | b1f12ddf8834ba77f2143344008b0e9f673cdda1 /src/plugins/platforms/cocoa | |
| parent | f35f282c4f0ef11dc35bc9120852ff9e77f85297 (diff) | |
| parent | 6f45fda50b6dbb0704a71a15f38d44027b4b1816 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaaccessibility.mm | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoasystemsettings.mm | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm index 1b84a1f05f..368cf56c80 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibility.mm +++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.mm @@ -226,7 +226,6 @@ bool shouldBeIgnored(QAccessibleInterface *interface) const QAccessible::Role role = interface->role(); if (role == QAccessible::Border || // QFrame role == QAccessible::Application || // We use the system-provided application element. - role == QAccessible::MenuItem || // The system also provides the menu items. role == QAccessible::ToolBar || // Access the tool buttons directly. role == QAccessible::Pane || // Scroll areas. role == QAccessible::Client) // The default for QWidget. 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; } |