diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-03-03 16:58:52 -0800 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-03-07 01:04:40 +0000 |
| commit | c1058cfd7b713ce91938439ab5bf945fd46dc803 (patch) | |
| tree | 05027e8eac12894e528b9a83aa96a53db821e9cd /src/gui/kernel/qkeysequence.cpp | |
| parent | e0e956bfc2cb418ca95e06f3f0f4d863a518fc6b (diff) | |
Remove remaining Carbon includes from QtCore, QtGui and QtWidgets
Carbon is deprecated and we should not rely on it at runtime or compile
time. These headers were only included for a small collection of
keyboard key constants which have now been hardcoded instead.
Change-Id: Ia2eaa267584b63be8019be3bbf64cba897a985a8
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Diffstat (limited to 'src/gui/kernel/qkeysequence.cpp')
| -rw-r--r-- | src/gui/kernel/qkeysequence.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index a6bc7d4d9c..1a106be98b 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -56,7 +56,6 @@ #if defined(Q_OS_MACX) #include <QtCore/private/qcore_mac_p.h> -#include <Carbon/Carbon.h> #endif #include <algorithm> @@ -70,6 +69,13 @@ struct MacSpecialKey { ushort macSymbol; }; +// Unicode code points for the glyphs associated with these keys +// Defined by Carbon headers but not anywhere in Cocoa +static const int kShiftUnicode = 0x21E7; +static const int kControlUnicode = 0x2303; +static const int kOptionUnicode = 0x2325; +static const int kCommandUnicode = 0x2318; + static const int NumEntries = 21; static const MacSpecialKey entries[NumEntries] = { { Qt::Key_Escape, 0x238B }, |