OS X: Use Cocoa Pasteboard instead of QClipBoard #3300

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index e9a18be902ca1dfdb7a8f173cba74c75e02677b6..69d65ad33e61e047e81b76d0ff98b2bc4f830bba 100644 (file)
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -97,6 +97,7 @@ IF( APPLE )
     list(APPEND client_SRCS settingsdialogmac.cpp)
     list(APPEND client_SRCS socketapisocket_mac.mm)
     list(APPEND client_SRCS systray.mm)
+    list(APPEND client_SRCS clipboard.mm)
 
     if(SPARKLE_FOUND)
        # Define this, we need to check in updater.cpp

diff --git a/src/gui/clipboard.mm b/src/gui/clipboard.mm
new file mode 100644 (file)
index 0000000..56361b7
--- /dev/null
+++ b/src/gui/clipboard.mm
@@ -0,0 +1,16 @@
+#include <QString>
+#include <QDebug>
+#import <Cocoa/Cocoa.h>
+
+namespace OCC {
+
+// https://github.com/owncloud/client/issues/3300
+void copyToPasteboard(const QString &string)
+{
+    qDebug() << Q_FUNC_INFO << string;
+    [[NSPasteboard generalPasteboard] clearContents];
+    [[NSPasteboard generalPasteboard] setString:[NSString stringWithUTF8String:string.toUtf8().data()]
+                                      forType:NSStringPboardType];
+}
+
+}

diff --git a/src/gui/sharedialog.cpp b/src/gui/sharedialog.cpp
index c4ac51a887c85337217be8a3aa2e008ca872863d..c4c5b71429fe13d8ef643da1cd9e372174d9db33 100644 (file)
--- a/src/gui/sharedialog.cpp
+++ b/src/gui/sharedialog.cpp
@@ -590,10 +590,18 @@ void ShareDialog::slotCheckBoxExpireClicked()
     }
 }
 
+#ifdef Q_OS_MAC
+extern void copyToPasteboard(const QString &string);
+#endif
+
 void ShareDialog::slotPushButtonCopyLinkPressed()
 {
+#ifdef Q_OS_MAC
+    copyToPasteboard(_shareUrl);
+#else
     QClipboard *clipboard = QApplication::clipboard();
     clipboard->setText(_shareUrl);
+#endif
 }
 
 void ShareDialog::slotCheckBoxEditingClicked()