whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <simon.hausmann@digia.com>
bb10
Tor Arne Vestbø 2014-01-16 11:11:06 +01:00 committed by The Qt Project
parent 64b385a82f
commit 04b8af2739
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/auto/gui/kernel/qkeysequence/tst_qkeysequence.cpp
View File

@ -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 },
};

4
tests/auto/shared/platformclipboard.h
View File

@ -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)