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

* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
  Missing icon in the designer documentation
  Fridge magnet example code snippet error
  qpaintdevice-qt3.html documentation errors
  QWebElement example missed information
  QSPlitter style-sheet example was invalid
  Errors in QSqlDriver::handle examples
  QGLColormap example was invalid
  QPointer made no mention of QWeakPointer
  Invalid links to http://developer.symbian.org
  QNetworkDiskCache documentation missed information
  QStyleSheet example used a property that is hidden.
  QList document referenced to non existing function
  QXmlQuery::bindVariable documentation bug
  Fix multiple typos in QLineF documentation.
  Qmake project file docs lacked information.
  Documentation error in SSL document
  Fix multiple typos in documentation.
  Fix for QVector::toList - code example documentation.

14 files changed, 37 insertions, 25 deletions

diff --git a/doc/src/development/designer-manual.qdoc b/doc/src/development/designer-manual.qdoc
index 348931f..f979547 100644
--- a/doc/src/development/designer-manual.qdoc
+++ b/doc/src/development/designer-manual.qdoc
@@ -694,8 +694,10 @@
         the object's name with the in-place editor.
 
         Since Qt 4.5, the \gui{Object Inspector} displays the layout state of
-        the containers. The broken layout icon ###ICON is displayed if there is
-        something wrong with the layouts.
+        the containers. The broken layout icon \inlineimage editbreaklayout.png
+        is displayed if there is something wrong (e.g. layout missing from the
+        container) with the layouts.
+		
 
     \endtable
 */
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index 0f85469..eabf2b9 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -438,7 +438,10 @@
 
     Note, that you must use "+=", not "=", or \l{qmake Manual#qmake}{\c qmake}
     will not be able to use Qt's configuration to determine the settings
-    needed for your project.
+    needed for your project. More information about operators can be found in the
+	\l{qmake Advanced Usage#Operators}
+    {Operators} section of the \l{qmake Advanced Usage}
+    chapter.
 
     \section1 Declaring Qt Libraries
 
@@ -464,6 +467,11 @@
 
     \snippet doc/src/snippets/code/doc_src_qmake-manual.pro 4
 
+	More information about operators can be found in the
+    \l{qmake Advanced Usage#Operators}
+    {Operators} section of the \l{qmake Advanced Usage}
+    chapter.
+	
     The table below shows the options that can be used with the \c QT variable
     and the features that are associated with each of them:
 
diff --git a/doc/src/examples/diagramscene.qdoc b/doc/src/examples/diagramscene.qdoc
index c7b4bfe..0518a33 100644
--- a/doc/src/examples/diagramscene.qdoc
+++ b/doc/src/examples/diagramscene.qdoc
@@ -149,11 +149,11 @@
     Example}{application example} if you need a high-level
     introduction to actions.
 
-    The is the \c createMenus() function:
+    Here is the \c createMenus() function:
 
     \snippet examples/graphicsview/diagramscene/mainwindow.cpp 24
 
-    We create the three menus' of the example.
+    We create the three menus of the example.
 
     The \c createToolbars() function sets up the examples tool
     bars.  The three \l{QToolButton}s in the \c colorToolBar, the \c
@@ -199,7 +199,7 @@
     each button; we store the diagram's type, i.e., the
     DiagramItem::DiagramType enum. We use the stored diagram type when
     we create new diagram items for the scene.  The widgets created
-    with this function is used in the tool box.
+    with this function are used in the tool box.
 
     Here is the \c createColorMenu() function:
     
@@ -443,7 +443,7 @@
     
     In the \c DiagramScene a mouse click can give three different
     actions: the item under the mouse can be moved, an item may be
-    inserted, or an arrow may be connected between to diagram items.
+    inserted, or an arrow may be connected between two diagram items.
     Which action a mouse click has depends on the mode, given by the
     Mode enum, the scene is in. The mode is set with the \c setMode()
     function.
@@ -456,7 +456,7 @@
     inserted is set with the \c setItemType() slot.
     
     The \c MainWindow and \c DiagramScene share responsibility for
-    the examples functionality. \c MainWindow handles the following
+    the example's functionality. \c MainWindow handles the following
     tasks: the deletion of items, text, and arrows; moving diagram
     items to the back and front; and setting the scale of the scene. 
 
@@ -624,7 +624,7 @@
 
     \snippet examples/graphicsview/diagramscene/diagramitem.cpp 0
 
-    In the constructor we create the items polygon according to
+    In the constructor we create the item's polygon according to
     \a diagramType. \l{QGraphicsItem}s are not movable or selectable
     by default, so we must set these properties.
 
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index f528bf2..f81f517 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -420,7 +420,7 @@
 */
 
 /*!
-    \externalpage http://developer.symbian.org/wiki/index.php/Platform_Security_%28Fundamentals_of_Symbian_C%2B%2B%29#Self-Signed_Applications
+    \externalpage http://www.developer.nokia.com/Community/Wiki/Qt_&_Symbian_Platform_Security
     \title Symbian Platform Security
 */
 
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 239f117..a4ae63f 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -590,7 +590,7 @@ the Symbian platform from scratch.
     The \l{Configuration Options for Qt} page gives a brief overview
     of these.
 
-    SBSv2 (also known as \l{http://developer.symbian.org/wiki/index.php/Introduction_to_RAPTOR} {Raptor})
+    SBSv2 (also known as \l{http://projects.developer.nokia.com/raptor/wiki} {Raptor})
     is a next-generation Symbian build system. SBSv2 is not officially supported
     by any of the S60 SDKs currently available from Forum Nokia.
 
@@ -1348,7 +1348,7 @@ We hope you will enjoy using Qt.
     \endlist
 
 
-    We recommend you to take a look at \l{http://developer.symbian.org/wiki/index.php/Qt_Quick_Start}{Symbian Foundation - Qt Quick Start}
+    We recommend you to take a look at \l{http://doc.qt.nokia.com/latest/install-symbian.html}{Installing Qt for the Symbian platform}
     to get more information about how to setup the development environment.
 
     \sa {Known Issues}
diff --git a/doc/src/howtos/appicon.qdoc b/doc/src/howtos/appicon.qdoc
index 8e7601f..2879b05 100644
--- a/doc/src/howtos/appicon.qdoc
+++ b/doc/src/howtos/appicon.qdoc
@@ -205,7 +205,7 @@
     In order to set the application icon for Symbian platform applications, you need
     an SVG-T icon. For information on how to create SVG-T compliant icons,
     please refer to
-    \l{http://wiki.forum.nokia.com/index.php/How_to_create_application_icon(SVG)_in_S60_3rd_edition/}
+    \l{http://wiki.forum.nokia.com/index.php/How_to_create_application_icon(SVG)_in_S60_3rd_edition}
 
     Once the icon is available in the correct format and assuming you are
     using \c qmake to generate your makefiles, you only need to add a single
diff --git a/doc/src/images/editbreaklayout.png b/doc/src/images/editbreaklayout.png
new file mode 100644
index 0000000..07c5fae
--- /dev/null
+++ b/doc/src/images/editbreaklayout.png
diff --git a/doc/src/network-programming/ssl.qdoc b/doc/src/network-programming/ssl.qdoc
index 0bbcd8a..ab84a29 100644
--- a/doc/src/network-programming/ssl.qdoc
+++ b/doc/src/network-programming/ssl.qdoc
@@ -58,7 +58,7 @@
     system:
 
     \code
-        ./configure -openssl-linked OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto'
+        OPENSSL_LIBS='-L/opt/ssl/lib -lssl -lcrypto' ./configure -openssl-linked 
     \endcode
 
     To disable SSL support in a Qt build, configure Qt with the \c{-no-openssl}
diff --git a/doc/src/platforms/symbian-introduction.qdoc b/doc/src/platforms/symbian-introduction.qdoc
index bacdbc8..f6979ef 100644
--- a/doc/src/platforms/symbian-introduction.qdoc
+++ b/doc/src/platforms/symbian-introduction.qdoc
@@ -205,7 +205,7 @@
     \table
     \row \o \c QT_SIS_OPTIONS      \o Options accepted by \c .sis creation. See
                                    \l{Supported options for QT_SIS_OPTIONS}{Supported options}
-                                    below. By default no otions are given.
+                                    below. By default no options are given.
     \row \o \c QT_SIS_TARGET       \o Target for which \c .sis file is created.
                                        Accepted values are build targets listed in
                                        previous table. By default last build target.
diff --git a/doc/src/snippets/code/doc_src_stylesheet.qdoc b/doc/src/snippets/code/doc_src_stylesheet.qdoc
index 99b31c9..78d76a8 100644
--- a/doc/src/snippets/code/doc_src_stylesheet.qdoc
+++ b/doc/src/snippets/code/doc_src_stylesheet.qdoc
@@ -481,7 +481,7 @@ QTextEdit { background-position: bottom center }
 
 
 //! [81]
-QDialog { etch-disabled-text: 1 }
+QDialogButtonBox { dialogbuttonbox-buttons-have-icons: 1; }
 //! [81]
 
 
@@ -1479,7 +1479,7 @@ QSplitter::handle:vertical {
 }
 
 QSplitter::handle:pressed {
-    url(images/splitter_pressed.png);
+    image: url(images/splitter_pressed.png);
 }
 
 //! [142]
diff --git a/doc/src/snippets/code/src_corelib_tools_qvector.cpp b/doc/src/snippets/code/src_corelib_tools_qvector.cpp
index fc46d91..fc1a7f7 100644
--- a/doc/src/snippets/code/src_corelib_tools_qvector.cpp
+++ b/doc/src/snippets/code/src_corelib_tools_qvector.cpp
@@ -148,10 +148,10 @@ vector.lastIndexOf("X");        // returns -1
 
 
 //! [14]
-QVector<double> vect;
+QVector<QString> vect;
 vect << "red" << "green" << "blue" << "black";
 
-QList<double> list = vect.toList();
+QList<QString> list = vect.toList();
 // list: ["red", "green", "blue", "black"]
 //! [14]
 
diff --git a/doc/src/snippets/code/src_opengl_qglcolormap.cpp b/doc/src/snippets/code/src_opengl_qglcolormap.cpp
index 3bd780b..535777d 100644
--- a/doc/src/snippets/code/src_opengl_qglcolormap.cpp
+++ b/doc/src/snippets/code/src_opengl_qglcolormap.cpp
@@ -42,7 +42,7 @@
 #include <QApplication>
 #include <QGLColormap>
 
-int main()
+int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
@@ -51,7 +51,8 @@ int main()
 
     // This will fill the colormap with colors ranging from
     // black to white.
-    for (int i = 0; i < colormap.size(); i++)
+    const int size = 256;
+    for (int i = 0; i < size; ++i)
         colormap.setEntry(i, qRgb(i, i, i));
 
     widget.setColormap(colormap);
diff --git a/doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp b/doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp
index d49b6e0..1a3772f 100644
--- a/doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp
+++ b/doc/src/snippets/code/src_sql_kernel_qsqldriver.cpp
@@ -41,7 +41,7 @@
 //! [0]
 QSqlDatabase db = ...;
 QVariant v = db.driver()->handle();
-if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*")==0) {
+if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {
     // v.data() returns a pointer to the handle
     sqlite3 *handle = *static_cast<sqlite3 **>(v.data());
     if (handle != 0) { // check that it is not NULL
@@ -52,12 +52,12 @@ if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*")==0) {
 
 
 //! [1]
-if (v.typeName() == "PGconn*") {
+if (qstrcmp(v.typeName(), "PGconn*") == 0) {
     PGconn *handle = *static_cast<PGconn **>(v.data());
     if (handle != 0) ...
 }
 
-if (v.typeName() == "MYSQL*") {
+if (qstrcmp(v.typeName(), "MYSQL*") == 0) {
     MYSQL *handle = *static_cast<MYSQL **>(v.data());
     if (handle != 0) ...
 }
diff --git a/doc/src/snippets/qxmlquery/bindingExample.cpp b/doc/src/snippets/qxmlquery/bindingExample.cpp
index 62e19be..a2c53eb 100644
--- a/doc/src/snippets/qxmlquery/bindingExample.cpp
+++ b/doc/src/snippets/qxmlquery/bindingExample.cpp
@@ -44,6 +44,7 @@
     device.open(QIODevice::ReadOnly);
 
     QXmlQuery query;
-    query.setQuery("doc($inputDocument)/query[theDocument]");
     query.bindVariable("inputDocument", &device);
+    query.setQuery("doc($inputDocument)/query[theDocument]");
+
 //! [0]