diff options
| -rw-r--r-- | tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/shared/platformclipboard.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp index 161a1692ca..20f84060b6 100644 --- a/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp @@ -50,7 +50,9 @@ #include <QLibraryInfo> #ifdef Q_OS_MAC +#ifdef Q_OS_OSX #include <Carbon/Carbon.h> +#endif struct MacSpecialKey { int key; ushort macSymbol; @@ -73,10 +75,12 @@ static const MacSpecialKey entries[NumEntries] = { { Qt::Key_Down, 0x2193 }, { Qt::Key_PageUp, 0x21DE }, { Qt::Key_PageDown, 0x21DF }, +#ifdef Q_OS_OSX { Qt::Key_Shift, kShiftUnicode }, { Qt::Key_Control, kCommandUnicode }, { Qt::Key_Meta, kControlUnicode }, { Qt::Key_Alt, kOptionUnicode }, +#endif { Qt::Key_CapsLock, 0x21EA }, }; diff --git a/tests/auto/shared/platformclipboard.h b/tests/auto/shared/platformclipboard.h index a430beef93..455ad9b276 100644 --- a/tests/auto/shared/platformclipboard.h +++ b/tests/auto/shared/platformclipboard.h @@ -44,7 +44,7 @@ #include <qglobal.h> -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX #include <Carbon/Carbon.h> #endif @@ -54,7 +54,7 @@ struct PlatformClipboard { #if defined(QT_NO_CLIPBOARD) return false; -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_OSX) PasteboardRef pasteboard; OSStatus status = PasteboardCreate(0, &pasteboard); if (status == noErr) |