1 files changed, 9 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoatheme.mm b/src/plugins/platforms/cocoa/qcocoatheme.mm
index a1c1b379f7..93f0400916 100644
--- a/src/plugins/platforms/cocoa/qcocoatheme.mm
+++ b/src/plugins/platforms/cocoa/qcocoatheme.mm
@@ -55,6 +55,7 @@
 #include <QtGui/private/qguiapplication_p.h>
 #include <QtGui/private/qcoregraphics_p.h>
 #include <QtGui/qpainter.h>
+#include <QtGui/qtextformat.h>
 #include <QtFontDatabaseSupport/private/qcoretextfontdatabase_p.h>
 #include <QtThemeSupport/private/qabstractfileiconengine_p.h>
 #include <qpa/qplatformdialoghelper.h>
@@ -97,7 +98,7 @@ QT_NAMESPACE_ALIAS_OBJC_CLASS(QCocoaThemeNotificationReceiver);
 {
     Q_UNUSED(notification);
     mPrivate->reset();
-    QWindowSystemInterface::handleThemeChange(Q_NULLPTR);
+    QWindowSystemInterface::handleThemeChange(nullptr);
 }
 @end
 
@@ -126,7 +127,7 @@ QCocoaTheme::~QCocoaTheme()
 void QCocoaTheme::reset()
 {
     delete m_systemPalette;
-    m_systemPalette = Q_NULLPTR;
+    m_systemPalette = nullptr;
     qDeleteAll(m_palettes);
     m_palettes.clear();
 }
@@ -274,7 +275,7 @@ QPixmap QCocoaTheme::standardPixmap(StandardPixmap sp, const QSizeF &size) const
     }
     if (iconType != 0) {
         QPixmap pixmap;
-        IconRef icon = Q_NULLPTR;
+        IconRef icon = nullptr;
         GetIconRef(kOnSystemDisk, kSystemIconsCreator, iconType, &icon);
 
         if (icon) {
@@ -341,9 +342,13 @@ QVariant QCocoaTheme::themeHint(ThemeHint hint) const
     case IconPixmapSizes:
         return QVariant::fromValue(QCocoaFileIconEngine::availableIconSizes());
     case QPlatformTheme::PasswordMaskCharacter:
-        return QVariant(QChar(kBulletUnicode));
+        return QVariant(QChar(0x2022));
     case QPlatformTheme::UiEffects:
         return QVariant(int(HoverEffect));
+    case QPlatformTheme::SpellCheckUnderlineStyle:
+        return QVariant(int(QTextCharFormat::DotLine));
+    case QPlatformTheme::UseFullScreenForPopupMenu:
+        return QVariant(bool([[NSApplication sharedApplication] presentationOptions] & NSApplicationPresentationFullScreen));
     default:
         break;
     }