Merge commit 'qt/master'

Conflicts:
	examples/opengl/samplebuffers/glwidget.cpp
	src/corelib/io/qfsfileengine_unix.cpp
	src/corelib/kernel/qobject.cpp
	src/corelib/tools/qsharedpointer.cpp
	src/gui/gui.pro
	tests/auto/qhttp/tst_qhttp.cpp
	tests/auto/qkeyevent/tst_qkeyevent.cpp

1 files changed, 16 insertions, 1 deletions

diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp
index e3bd9e4a5e..24e617f5ff 100644
--- a/tests/auto/qtimer/tst_qtimer.cpp
+++ b/tests/auto/qtimer/tst_qtimer.cpp
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://www.qtsoftware.com/contact.
+** contact the sales department at http://qt.nokia.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -73,6 +73,7 @@ public slots:
     void init();
     void cleanup();
 private slots:
+    void zeroTimer();
     void singleShotTimeout();
     void timeout();
     void livelock_data();
@@ -131,6 +132,20 @@ void tst_QTimer::cleanup()
 {
 }
 
+void tst_QTimer::zeroTimer()
+{
+    TimerHelper helper;
+    QTimer timer;
+    timer.setInterval(0);
+    timer.start();
+
+    connect(&timer, SIGNAL(timeout()), &helper, SLOT(timeout()));
+
+    QCoreApplication::processEvents();
+
+    QCOMPARE(helper.count, 1);
+}
+
 void tst_QTimer::singleShotTimeout()
 {
     TimerHelper helper;