diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:18:59 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-02-29 09:23:14 +1000 |
| commit | 98dd1781d9256f68025d2a2db408f4f5947f3214 (patch) | |
| tree | dbe1424abd90014edb5546c920ca585ed62b46e3 /src/plugins/platforms/cocoa/qcocoatheme.mm | |
| parent | 6c1bdc1854a7700c2b3a345b95f6a2fdca84037d (diff) | |
| parent | fa1b9070af66edb81b2a3735c1951f78b22bd666 (diff) | |
Merge master -> api_changes
Includes fixes for tst_qfiledialog2, tst_qtextedit autotests on mac.
Change-Id: I49cac26894d31291a8339ccc1eb80b6a940f0827
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoatheme.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoatheme.mm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm index ad20c2fb27..0fef3234b4 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.mm +++ b/src/plugins/platforms/cocoa/qcocoatheme.mm @@ -105,13 +105,16 @@ QPlatformDialogHelper * QCocoaTheme::createPlatformDialogHelper(DialogType dialo QVariant QCocoaTheme::themeHint(ThemeHint hint) const { switch (hint) { - case QPlatformTheme::StyleNames: - return QStringList() << QLatin1Literal("macintosh"); - break; - default: - return QPlatformTheme::themeHint(hint); + case QPlatformTheme::StyleNames: + return QStringList(QStringLiteral("macintosh")); + case QPlatformTheme::DialogButtonBoxLayout: + return QVariant(1); // QDialogButtonBox::MacLayout + case KeyboardScheme: + return QVariant(int(MacKeyboardScheme)); + default: break; } + return QPlatformTheme::themeHint(hint); } QT_END_NAMESPACE |