1 files changed, 50 insertions, 6 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaservices.mm b/src/plugins/platforms/cocoa/qcocoaservices.mm
index 29f8ed96e6..87212c265c 100644
--- a/src/plugins/platforms/cocoa/qcocoaservices.mm
+++ b/src/plugins/platforms/cocoa/qcocoaservices.mm
@@ -4,26 +4,70 @@
 #include "qcocoaservices.h"
 
 #include <AppKit/NSWorkspace.h>
+#include <AppKit/NSColorSampler.h>
 #include <Foundation/NSURL.h>
 
 #include <QtCore/QUrl>
+#include <QtCore/qscopedvaluerollback.h>
+
+#include <QtGui/qdesktopservices.h>
+#include <QtGui/private/qcoregraphics_p.h>
 
 QT_BEGIN_NAMESPACE
 
 bool QCocoaServices::openUrl(const QUrl &url)
 {
-    const QString scheme = url.scheme();
-    if (scheme.isEmpty())
-        return openDocument(url);
+    // avoid recursing back into self
+    if (url == m_handlingUrl)
+        return false;
+
     return [[NSWorkspace sharedWorkspace] openURL:url.toNSURL()];
 }
 
 bool QCocoaServices::openDocument(const QUrl &url)
 {
-    if (!url.isValid())
-        return false;
+    return openUrl(url);
+}
+
+/* Callback from macOS that the application should handle a URL */
+bool QCocoaServices::handleUrl(const QUrl &url)
+{
+    QScopedValueRollback<QUrl> rollback(m_handlingUrl, url);
+    // FIXME: Add platform services callback from QDesktopServices::setUrlHandler
+    // so that we can warn the user if calling setUrlHandler without also setting
+    // up the matching keys in the Info.plist file (CFBundleURLTypes and friends).
+    return QDesktopServices::openUrl(url);
+}
 
-    return [[NSWorkspace sharedWorkspace] openFile:url.toLocalFile().toNSString()];
+class QCocoaColorPicker : public QPlatformServiceColorPicker
+{
+public:
+    QCocoaColorPicker() : m_colorSampler([NSColorSampler new]) {}
+    ~QCocoaColorPicker() { [m_colorSampler release]; }
+
+    void pickColor() override
+    {
+        [m_colorSampler showSamplerWithSelectionHandler:^(NSColor *selectedColor) {
+            emit colorPicked(qt_mac_toQColor(selectedColor));
+        }];
+    }
+private:
+    NSColorSampler *m_colorSampler = nullptr;
+};
+
+
+QPlatformServiceColorPicker *QCocoaServices::colorPicker(QWindow *parent)
+{
+    Q_UNUSED(parent);
+    return new QCocoaColorPicker;
+}
+
+bool QCocoaServices::hasCapability(Capability capability) const
+{
+    switch (capability) {
+    case ColorPicking: return true;
+    default: return false;
+    }
 }
 
 QT_END_NAMESPACE