Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (92 commits)
  Make QStackTextEngine cheaper to construct
  Add a function to get the transitions available from a state
  Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets (part 2).
  Code cleaning for the QStringList's joinEmptiness() test case
  Fix behavior change QStringList::join() for null
  Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets.
  Cocoa: fix eventdispatcher crash, found by macgui autotest
  Make QWidget::activateWindow() NET window manager aware.
  Upgraded QLocale data to Unicode CLDR 1.8.0
  Improved CLDR parser.
  Fixed reading draft data from CLDR.
  Improved the cldr parser for QLocale.
  Do not use FSEvents-based filesystemwatcher backend on Mac.
  add file missing in commit 74f5e34979b8a08a91aa3c2fa6d252e68eca7817
  Moc: Add support for rvalue references in signals and slots.
  Add support for polyphonic greek
  Fix build failure on WinCE.
  Autotests: if you use X11 libs, you must link to X11 libs explicitly.
  Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
  Compile Phonon in C++0x mode.
  ...

1 files changed, 17 insertions, 1 deletions

diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index b6b3281..69cca06 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -66,7 +66,8 @@ QT_BEGIN_NAMESPACE
   states. QState is part of \l{The State Machine Framework}.
 
   The addTransition() function adds a transition. The removeTransition()
-  function removes a transition.
+  function removes a transition. The transitions() function returns the
+  state's outgoing transitions.
 
   The assignProperty() function is used for defining property assignments that
   should be performed when a state is entered.
@@ -408,6 +409,21 @@ void QState::removeTransition(QAbstractTransition *transition)
 }
 
 /*!
+  \since 4.7
+
+  Returns this state's outgoing transitions (i.e. transitions where
+  this state is the \l{QAbstractTransition::sourceState()}{source
+  state}), or an empty list if this state has no outgoing transitions.
+
+  \sa addTransition()
+*/
+QList<QAbstractTransition*> QState::transitions() const
+{
+    Q_D(const QState);
+    return d->transitions();
+}
+
+/*!
   \reimp
 */
 void QState::onEntry(QEvent *event)