summaryrefslogtreecommitdiffstats
path: root/tests/auto/shared
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@qt.io>2017-03-03 17:01:00 -0800
committerJake Petroules <jake.petroules@qt.io>2017-03-07 01:04:46 +0000
commitb181da98850e1f1db620540dd583da615ad9c5fe (patch)
tree00115d2131000c58dbec18b4002de6165882ed79 /tests/auto/shared
parentc1058cfd7b713ce91938439ab5bf945fd46dc803 (diff)
Remove workaround for potentially unavailable pasteboard in macOS
This was added in 2006 (when Tiger was the latest version of macOS) in order to work around an issue where the pasteboard would not be available when running under a non-graphical session. The latest supported version of macOS is currently 10.10 on which this is not expected to be an issue, so this workaround and therefore the Carbon dependency can be removed. Change-Id: Id5ed0a7e531dda71ce461c8bbbaebd5d4cadbd0e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'tests/auto/shared')
-rw-r--r--tests/auto/shared/platformclipboard.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/tests/auto/shared/platformclipboard.h b/tests/auto/shared/platformclipboard.h
index c5f1a64dce..15801f6add 100644
--- a/tests/auto/shared/platformclipboard.h
+++ b/tests/auto/shared/platformclipboard.h
@@ -31,22 +31,12 @@
#include <qglobal.h>
-#ifdef Q_OS_OSX
-#include <Carbon/Carbon.h>
-#endif
-
struct PlatformClipboard
{
static inline bool isAvailable()
{
#if defined(QT_NO_CLIPBOARD)
return false;
-#elif defined(Q_OS_OSX)
- PasteboardRef pasteboard;
- OSStatus status = PasteboardCreate(0, &pasteboard);
- if (status == noErr)
- CFRelease(pasteboard);
- return status == noErr;
#else
return true;
#endif