diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-29 22:58:27 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-29 22:58:27 (GMT) |
commit | 1fe08312164a8eef87b3efe9b77452b86224999f (patch) | |
tree | 65d3147ae69860d9031ffaa86dcdd28f5d5fca21 /tests/auto/qlineedit/tst_qlineedit.cpp | |
parent | 10b5653ad4f25c6f37d640facf4a5ef01fe25926 (diff) | |
parent | c2c31f30830a4e1e455a13321dd7bae6ac8b360f (diff) | |
download | Qt-1fe08312164a8eef87b3efe9b77452b86224999f.zip Qt-1fe08312164a8eef87b3efe9b77452b86224999f.tar.gz Qt-1fe08312164a8eef87b3efe9b77452b86224999f.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qlineedit/tst_qlineedit.cpp')
-rw-r--r-- | tests/auto/qlineedit/tst_qlineedit.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/qlineedit/tst_qlineedit.cpp b/tests/auto/qlineedit/tst_qlineedit.cpp index 9fe8e49..4f4761c 100644 --- a/tests/auto/qlineedit/tst_qlineedit.cpp +++ b/tests/auto/qlineedit/tst_qlineedit.cpp @@ -1417,8 +1417,22 @@ void tst_QLineEdit::undo_keypressevents() } #ifndef QT_NO_CLIPBOARD +static bool nativeClipboardWorking() +{ +#ifdef Q_WS_MAC + PasteboardRef pasteboard; + OSStatus status = PasteboardCreate(0, &pasteboard); + if (status == noErr) + CFRelease(pasteboard); + return status == noErr; +#endif + return true; +} + void tst_QLineEdit::QTBUG5786_undoPaste() { + if (!nativeClipboardWorking()) + QSKIP("this machine doesn't support the clipboard", SkipAll); QString initial("initial"); QString string("test"); QString additional("add"); |