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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits)
  Doc: css fine tuning
  Doc: Fixed a non-compiling example.
  Doc: removing linebreak
  Doc: correcting html template
  Doc: Updated What's new in 4.7 page
  Doc: Updated What's new in 4.7 page
  Doc: Removing google analytics from offline docs
  Doc: fixing creator bug in page footer
  Doc: correcting html template - validating
  Doc: fixing issues with table indent - css
  Doc: Fixing style: line height, ol indent, coulmns (css3)
  Doc: correcting html template
  Doc: Updated the Mac requirements page.
  Doc: Cleaning up the known issues page. Pointing people to check the online resources.
  Added a QFormLayout snippet to the layout.qdoc and layouts.cpp
  Doc: Removing section about Multimedia - playback and declarative elements. This was descoped from Qt 4.7.
  Doc: Listed undoable operations in QTextDocument
  Revert "Doc: fixing page name bug caused by 07bbace404078dcfd82eff717daa97299b8ba52c changing qml elements page"
  Doc: Note on updating proxy models with dynamic sort filters
  qdoc: Fixed an html formatting error in the QML property list.
  ...

4 files changed, 104 insertions, 6 deletions

diff --git a/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp b/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp
index fd3f5d2..472c90e 100644
--- a/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp
+++ b/doc/src/snippets/code/src_corelib_kernel_qvariant.cpp
@@ -101,7 +101,7 @@ QVariant v;
 
 MyCustomStruct c;
 if (v.canConvert<MyCustomStruct>())
-    c = v.value<MyCustomStruct>(v);
+    c = v.value<MyCustomStruct>();
 
 v = 7;
 int i = v.value<int>();                        // same as v.toInt()
diff --git a/doc/src/snippets/declarative/text/onLinkActivated.qml b/doc/src/snippets/declarative/text/onLinkActivated.qml
new file mode 100644
index 0000000..0fb236a
--- /dev/null
+++ b/doc/src/snippets/declarative/text/onLinkActivated.qml
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+**     the names of its contributors may be used to endorse or promote
+**     products derived from this software without specific prior written
+**     permission.
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+import Qt 4.7
+
+Rectangle {
+    width: 700; height: 400
+
+//![0]
+    Text {
+            textFormat: Text.RichText
+            text: "The main website is at <a href=\"http://qt.nokia.com\">Nokia Qt DF</a>."
+            onLinkActivated: console.log(link + " link activated")
+    }
+//![0]
+
+}
+
diff --git a/doc/src/snippets/layouts/layouts.cpp b/doc/src/snippets/layouts/layouts.cpp
index 66c9b9d..58440f5 100644
--- a/doc/src/snippets/layouts/layouts.cpp
+++ b/doc/src/snippets/layouts/layouts.cpp
@@ -66,7 +66,9 @@ int main(int argc, char *argv[])
     layout->addWidget(button5);
 
     window->setLayout(layout);
-//! [4] //! [5]
+//! [4]
+    window->setWindowTitle("QHBoxLayout");
+//! [5]
     window->show();
 //! [5]
     }
@@ -93,7 +95,9 @@ int main(int argc, char *argv[])
     layout->addWidget(button5);
 
     window->setLayout(layout);
-//! [10] //! [11]
+//! [10]
+    window->setWindowTitle("QVBoxLayout");
+//! [11]
     window->show();
 //! [11]
     }
@@ -120,10 +124,42 @@ int main(int argc, char *argv[])
     layout->addWidget(button5, 2, 1);
 
     window->setLayout(layout);
-//! [16] //! [17]
+//! [16]
+    window->setWindowTitle("QGridLayout");
+//! [17]
     window->show();
 //! [17]
     }
 
+    {
+//! [18]
+    QWidget *window = new QWidget;
+//! [18]
+//! [19]
+    QPushButton *button1 = new QPushButton("One");
+    QLineEdit *lineEdit1 = new QLineEdit();
+//! [19]
+//! [20]
+    QPushButton *button2 = new QPushButton("Two");
+    QLineEdit *lineEdit2 = new QLineEdit();
+    QPushButton *button3 = new QPushButton("Three");
+    QLineEdit *lineEdit3 = new QLineEdit();
+//! [20]
+//! [21]
+    QFormLayout *layout = new QFormLayout;
+//! [21]
+//! [22]
+    layout->addRow(button1, lineEdit1);
+    layout->addRow(button2, lineEdit2);
+    layout->addRow(button3, lineEdit3);
+
+    window->setLayout(layout);
+//! [22]
+    window->setWindowTitle("QFormLayout");
+//! [23]
+    window->show();
+//! [23]    
+    }
+
     return app.exec();
 }
diff --git a/doc/src/snippets/signalmapper/filereader.cpp b/doc/src/snippets/signalmapper/filereader.cpp
index 76ed4c1..08f4d06 100644
--- a/doc/src/snippets/signalmapper/filereader.cpp
+++ b/doc/src/snippets/signalmapper/filereader.cpp
@@ -66,10 +66,18 @@ FileReader::FileReader(QWidget *parent)
 //! [0]
 
 //! [1]
-    connect(signalMapper, SIGNAL(mapped(const QString &)),
-        this, SLOT(readFile(const QString &)));
+    connect(signalMapper, SIGNAL(mapped(QString)),
+        this, SLOT(readFile(QString)));
 //! [1]
 
+/*
+//! [2]
+    //slower due to signature normalization at runtime
+    
+    connect(signalMapper, SIGNAL(mapped(const QString &)),
+        this, SLOT(readFile(const QString &)));
+//! [2]
+*/
     QHBoxLayout *buttonLayout = new QHBoxLayout;
     buttonLayout->addWidget(taxFileButton);
     buttonLayout->addWidget(accountFileButton);