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

5 files changed, 46 insertions, 5 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/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 3619243..4307e0e 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -652,7 +652,9 @@ If you are using pre-built binaries, follow the instructions
     \section1 OpenSSL (version 0.9.7 or later)
 
     Support for \l{SSL}{Secure Sockets Layer (SSL)} communication is provided by the
-    \l{OpenSSL Toolkit}, which must be obtained separately.
+    \l{OpenSSL Toolkit}, which must be obtained separately. More information about
+    enabling SSL support can be found in the \l{Secure Sockets Layer (SSL) Classes}
+    document.
 
     \section1 Platform-Specific Requirements
 
diff --git a/doc/src/network-programming/ssl.qdoc b/doc/src/network-programming/ssl.qdoc
index fa37cb9..8117823 100644
--- a/doc/src/network-programming/ssl.qdoc
+++ b/doc/src/network-programming/ssl.qdoc
@@ -54,6 +54,32 @@
     See the \l{General Qt Requirements} page for information about the
     versions of OpenSSL that are known to work with Qt.
 
+    \section1 Enabling and Disabling SSL Support
+
+    When building Qt from source, the configuration system checks for the presence
+    of the \c{openssl/opensslv.h} header provided by source or developer packages
+    of OpenSSL.
+
+    By default, an SSL-enabled Qt library dynamically loads any installed OpenSSL
+    library at run-time. However, it is possible to link against the library at
+    compile-time by configuring Qt with the \c{-openssl-linked} option.
+
+    When building a version of Qt linked against OpenSSL, the build system will
+    attempt to link with libssl and libcrypt libraries located in the default
+    location on the developer's system. This location is configurable:
+    set the \c OPENSSL_LIBS environment variable to contain the linker options
+    required to link Qt against the installed library. For example, on a Unix/Linux
+    system:
+
+    \code
+        ./configure -openssl-linked OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto'
+    \endcode
+
+    To disable SSL support in a Qt build, configure Qt with the \c{-no-openssl}
+    option.
+
+    \section1 Licensing Information
+
     \note Due to import and export restrictions in some parts of the world, we
     are unable to supply the OpenSSL Toolkit with Qt packages. Developers wishing
     to use SSL communication in their deployed applications should either ensure
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