From d69671cf3fc6bf51e7cbb322dce51fa0719ae6bc Mon Sep 17 00:00:00 2001 From: Joona Petrell Date: Mon, 12 Jul 2010 14:35:24 +1000 Subject: Fix Mac CI --- .../qdeclarativetextedit/tst_qdeclarativetextedit.cpp | 12 ++++++++++++ .../qdeclarativetextinput/tst_qdeclarativetextinput.cpp | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp index 3e6a38c..4783bc7 100644 --- a/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp +++ b/tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp @@ -853,6 +853,18 @@ void tst_qdeclarativetextedit::navigation() void tst_qdeclarativetextedit::copyAndPaste() { #ifndef QT_NO_CLIPBOARD + +#ifdef Q_WS_MAC + { + PasteboardRef pasteboard; + OSStatus status = PasteboardCreate(0, &pasteboard); + if (status == noErr) + CFRelease(pasteboard); + else + QSKIP("This machine doesn't support the clipboard", SkipAll); + } +#endif + QString componentStr = "import Qt 4.7\nTextEdit { text: \"Hello world!\" }"; QDeclarativeComponent textEditComponent(&engine); textEditComponent.setData(componentStr.toLatin1(), QUrl()); diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index c8767b5..a48bc39 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -700,6 +700,18 @@ void tst_qdeclarativetextinput::navigation() void tst_qdeclarativetextinput::copyAndPaste() { #ifndef QT_NO_CLIPBOARD + +#ifdef Q_WS_MAC + { + PasteboardRef pasteboard; + OSStatus status = PasteboardCreate(0, &pasteboard); + if (status == noErr) + CFRelease(pasteboard); + else + QSKIP("This machine doesn't support the clipboard", SkipAll); + } +#endif + QString componentStr = "import Qt 4.7\nTextInput { text: \"Hello world!\" }"; QDeclarativeComponent textInputComponent(&engine); textInputComponent.setData(componentStr.toLatin1(), QUrl()); -- cgit v0.12