Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

3 files changed, 17 insertions, 4 deletions

diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc
index 9f5d785..2011aa9 100644
--- a/doc/src/examples/diagramscene.qdoc
+++ b/doc/src/examples/diagramscene.qdoc
@@ -704,7 +704,7 @@
     We use \c itemChange() and \c focusOutEvent() to notify the
     \c DiagramScene when the text item loses focus and gets selected.
 
-    Vi reimplement the functions that handle mouse events to make it
+    We reimplement the functions that handle mouse events to make it
     possible to alter the mouse behavior of QGraphicsTextItem.
 
     \section1 DiagramTextItem Implementation
@@ -729,7 +729,8 @@
     \snippet examples/graphicsview/diagramscene/diagramtextitem.cpp 2
 
     \c DiagramScene uses the signal emitted when the text item looses
-    remove the item if it is empty, i.e., it contains no text. 
+    focus to remove the item if it is empty, i.e., it contains no
+    text. 
 
     This is the implementation of \c mouseDoubleClickEvent():
 
@@ -838,7 +839,7 @@
 
     \snippet examples/graphicsview/diagramscene/arrow.cpp 7
 
-    If the line is selected we draw to dotted lines that are
+    If the line is selected, we draw two dotted lines that are
     parallel with the line of the arrow. We do not use the default
     implementation, which uses \l{QGraphicsItem::}{boundingRect()}
     because the QRect bounding rectangle is considerably larger than
diff --git a/doc/src/snippets/code/src_corelib_io_qsettings.cpp b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
index 12a204b..c380d19 100644
--- a/doc/src/snippets/code/src_corelib_io_qsettings.cpp
+++ b/doc/src/snippets/code/src_corelib_io_qsettings.cpp
@@ -309,7 +309,7 @@ int main(int argc, char *argv[])
     const QSettings::Format XmlFormat =
             QSettings::registerFormat("xml", readXmlFile, writeXmlFile);
 
-    QSettings settings(XmlFormat, QSettings::UserSettings, "MySoft",
+    QSettings settings(XmlFormat, QSettings::UserScope, "MySoft",
                        "Star Runner");
 
     ...
diff --git a/doc/src/widgets-and-layouts/stylesheet.qdoc b/doc/src/widgets-and-layouts/stylesheet.qdoc
index 6355850..354050d 100644
--- a/doc/src/widgets-and-layouts/stylesheet.qdoc
+++ b/doc/src/widgets-and-layouts/stylesheet.qdoc
@@ -2067,6 +2067,9 @@
            QMenuBar, QPushButton, QRadioButton, QSizeGrip, QSpinBox,
            QSplitter, QStatusBar, QTextEdit, and QToolTip.
 
+           The value is relative to the contents rect in the \l{The
+           Box Model}{box model}.
+
            Example:
 
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 63
@@ -2084,6 +2087,9 @@
            QMenuBar, QPushButton, QRadioButton, QSizeGrip, QSpinBox,
            QSplitter, QStatusBar, QTextEdit, and QToolTip.
 
+           The value is relative to the contents rect in the \l{The
+           Box Model}{box model}.
+
            Example:
 
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 64
@@ -2121,6 +2127,9 @@
            If this property is not specified, the minimum height is
            derived based on the widget's contents and the style.
 
+           The value is relative to the contents rect in the \l{The
+           Box Model}{box model}.
+
            Example:
 
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 66
@@ -2141,6 +2150,9 @@
            If this property is not specified, the minimum width is
            derived based on the widget's contents and the style.
 
+           The value is relative to the contents rect in the \l{The
+           Box Model}{box model}.
+
            Example:
 
            \snippet doc/src/snippets/code/doc_src_stylesheet.qdoc 67