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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fixed regression in QPixmap::size() for null pixmaps.
  Make test less sensitive to platform specifics
  Doc: Further QML improvements.
  Doc: Minor improvements to QML-related documentation.
  The test livelock of QTimer is now expected to work
  Make sure mapSelectionFromSource does not return a selection with invalid ranges.
  QEventDispatcherUnix: do not process too many timer if other events need to be processed first
  Doc: Continued work on the QML documentation.
  Doc: More work on the QML documentation.
  Doc: More work on the declarative API documentation.
  Doc: Some editing and tidying up.
  Doc: Added a missing file.
  Doc: Fixed text in license headers.

1 files changed, 4 insertions, 0 deletions

diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.qml b/examples/tutorials/gettingStarted/gsQml/texteditor.qml
index 3bd9d55..5a75e0b 100644
--- a/examples/tutorials/gettingStarted/gsQml/texteditor.qml
+++ b/examples/tutorials/gettingStarted/gsQml/texteditor.qml
@@ -100,6 +100,7 @@ Rectangle {
         }
     }
 
+//! [states]
     states:[
         State {
             name: "DRAWER_OPEN"
@@ -116,7 +117,9 @@ Rectangle {
             PropertyChanges { target: arrowIcon; rotation: 0 }
         }
     ]
+//! [states]
 
+//! [transitions]
     transitions: [
         Transition {
             to: "*"
@@ -125,4 +128,5 @@ Rectangle {
             NumberAnimation { target: drawer; properties: "y"; duration: 100; easing.type: Easing.OutExpo }
         }
     ]
+//! [transitions]
 }