Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Merge request: 1111
  Doc: inform better about how you can tweak Qt apps on Mac
  Mac: add support for closing dialogs using Cmd-D
  Cocoa: use mouse location from event
  Cocoa: implement eventdispatcher flag excludeUserInputEvents
  Cocoa: processEvents does not always send posted events
  Added QMdiArea::tabsMovable and tabsClosable
  Enable the widthForHeight() test case.
  Fix some wrong tests in heightForWidth()
  Fix and enable the tests that were disabled.
  Fixed a double selection in QFileDialog when saving
  fix qFadeEffect windowOpacity issue on Windows
  Cleanup unused QAccessWidget
  Fixed a problem with toolbars not relayouting
  Compile fix on solaris
  Autotest illustrating Qt::InitialSortOrderRole
  Mention when the role was introduced
  Add a way to set QHeaderView initial sort order
  Doc: Fixing typo

2 files changed, 17 insertions, 13 deletions

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index afbaa27..f015ed0 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -1628,6 +1628,7 @@ public:
         AccessibleDescriptionRole = 12,
         // More general purpose
         SizeHintRole = 13,
+        InitialSortOrderRole = 14,
         // Internal UiLib roles. Start worrying when public roles go that high.
         DisplayPropertyRole = 27,
         DecorationPropertyRole = 28,
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index f98ea4a..bc15514 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -2699,19 +2699,22 @@
 
     Roles describing appearance and meta data (with associated types):
 
-    \value FontRole            The font used for items rendered with the default
-                               delegate. (QFont)
-    \value TextAlignmentRole   The alignment of the text for items rendered with the
-                               default delegate. (Qt::AlignmentFlag)
-    \value BackgroundRole      The background brush used for items rendered with
-                               the default delegate. (QBrush)
-    \value BackgroundColorRole This role is obsolete. Use BackgroundRole instead.
-    \value ForegroundRole      The foreground brush (text color, typically)
-                               used for items rendered with the default delegate.
-                               (QBrush)
-    \value TextColorRole       This role is obsolete. Use ForegroundRole instead.
-    \value CheckStateRole      This role is used to obtain the checked state of
-                               an item. (Qt::CheckState)
+    \value FontRole             The font used for items rendered with the default
+                                delegate. (QFont)
+    \value TextAlignmentRole    The alignment of the text for items rendered with the
+                                default delegate. (Qt::AlignmentFlag)
+    \value BackgroundRole       The background brush used for items rendered with
+                                the default delegate. (QBrush)
+    \value BackgroundColorRole  This role is obsolete. Use BackgroundRole instead.
+    \value ForegroundRole       The foreground brush (text color, typically)
+                                used for items rendered with the default delegate.
+                                (QBrush)
+    \value TextColorRole        This role is obsolete. Use ForegroundRole instead.
+    \value CheckStateRole       This role is used to obtain the checked state of
+                                an item. (Qt::CheckState)
+    \value InitialSortOrderRole This role is used to obtain the initial sort order
+                                of a header view section. (Qt::SortOrder). This
+                                role was introduced in Qt 4.8.
 
     Accessibility roles (with associated types):