--- a/tests/auto/qtimer/tst_qtimer.cpp	Mon Jun 21 22:38:13 2010 +0100
+++ b/tests/auto/qtimer/tst_qtimer.cpp	Thu Jul 22 16:41:55 2010 +0100
@@ -85,6 +85,7 @@
     void timerFiresOnlyOncePerProcessEvents();
     void timerIdPersistsAfterThreadExit();
     void cancelLongTimer();
+    void singleShotStaticFunctionZeroTimeout();
 };
 
 class TimerHelper : public QObject
@@ -611,5 +612,16 @@
     QVERIFY(!timer.isActive());
 }
 
+void tst_QTimer::singleShotStaticFunctionZeroTimeout()
+{
+    TimerHelper helper;
+
+    QTimer::singleShot(0, &helper, SLOT(timeout()));
+    QTest::qWait(500);
+    QCOMPARE(helper.count, 1);
+    QTest::qWait(500);
+    QCOMPARE(helper.count, 1);
+}
+
 QTEST_MAIN(tst_QTimer)
 #include "tst_qtimer.moc"