Merge remote-tracking branch 'origin/master' into api_changes

Conflicts:
	configure
	src/widgets/styles/qwindowsxpstyle.cpp
	tests/auto/gui/kernel/qwindow/qwindow.pro
	tests/auto/gui/kernel/qwindow/tst_qwindow.cpp

Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3

1 files changed, 27 insertions, 4 deletions

diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp
index 9c025d6d6f..cf9b0cea4f 100644
--- a/src/corelib/kernel/qabstracteventdispatcher.cpp
+++ b/src/corelib/kernel/qabstracteventdispatcher.cpp
@@ -337,14 +337,37 @@ void QAbstractEventDispatcher::closingDown()
 { }
 
 /*!
-    \typedef QAbstractEventDispatcher::TimerInfo
+    \class QAbstractEventDispatcher::TimerInfo
 
-    Typedef for QPair<int, int>. The first component of
-    the pair is the timer ID; the second component is
-    the interval.
+    This struct represents information about a timer:
+    \l{QAbstractEventDispatcher::TimerInfo::timerId}{timerId},
+    \l{QAbstractEventDispatcher::TimerInfo::interval}{interval}, and
+    \l{QAbstractEventDispatcher::TimerInfo::timerType}{timerType}.
 
     \sa registeredTimers()
 */
+/*! \fn QAbstractEventDispatcher::TimerInfo::TimerInfo(int timerId, int interval, Qt::TimerType timerType)
+
+    Constructs a TimerInfo struct with the given \a timerId, \a interval, and
+    \a timerType.
+*/
+/*!
+    \variable QAbstractEventDispatcher::TimerInfo::timerId
+
+    The timer's unique id.
+*/
+/*!
+    \variable QAbstractEventDispatcher::TimerInfo::interval
+
+    The timer's interval.
+*/
+/*!
+    \variable QAbstractEventDispatcher::TimerInfo::timerType
+
+    The timer's type
+
+    \sa Qt::TimerType
+*/
 
 /*!
     \typedef QAbstractEventDispatcher::EventFilter