diff options
author | Martin Smith <msmith@trolltech.com> | 2010-04-27 08:45:30 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2010-04-27 08:45:30 (GMT) |
commit | 9cea45515ef283c9a870c6f515da50d31addafcf (patch) | |
tree | d14fdf2b17a2a52c90ac514c39ad60be200cc7d7 /tests/auto/macnativeevents/nativeeventlist.h | |
parent | 6749edd4c6f647c4963793183a452bb1ae769c1c (diff) | |
parent | 13dff164d2ab13b1258d31693b67acebc8636890 (diff) | |
download | Qt-9cea45515ef283c9a870c6f515da50d31addafcf.zip Qt-9cea45515ef283c9a870c6f515da50d31addafcf.tar.gz Qt-9cea45515ef283c9a870c6f515da50d31addafcf.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tests/auto/macnativeevents/nativeeventlist.h')
-rw-r--r-- | tests/auto/macnativeevents/nativeeventlist.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/macnativeevents/nativeeventlist.h b/tests/auto/macnativeevents/nativeeventlist.h index 688665d..efcca43 100644 --- a/tests/auto/macnativeevents/nativeeventlist.h +++ b/tests/auto/macnativeevents/nativeeventlist.h @@ -57,7 +57,6 @@ class NativeEventList : public QObject void append(QNativeEvent *event); void append(int waitMs, QNativeEvent *event = 0); - void append(int waitMs); void play(Playback playback = WaitUntilFinished); void stop(); |