From 04b8af2739bb68b4c9648225c16cf6a515745fff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 16 Jan 2014 11:11:06 +0100 Subject: iOS: Fix compilation of some basic tests The tests themselves may not actually pass, but it's a start, and allows us to sanity-build a few things in the CI that actually produces a final binary. Change-Id: I02643b6ffa1522de1a7d17d737c8ab45ffac6a93 Reviewed-by: Simon Hausmann --- tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp | 4 ++++ 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 #ifdef Q_OS_MAC +#ifdef Q_OS_OSX #include +#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 -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX #include #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) -- cgit v1.2.3