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:
  Fix a small typo in assistant manual: hompage -> homepage
  Print icon in doc pages has no effect.
  Assistant has unnecessary repaints when expand/collapse selected node.
  Compile fixes.
  Changelog: Added Designer/uic3 changes for 4.7.0.

9 files changed, 32 insertions, 10 deletions

diff --git a/dist/changes-4.7.0 b/dist/changes-4.7.0
index 1e3a69c..41fe9d2 100644
--- a/dist/changes-4.7.0
+++ b/dist/changes-4.7.0
@@ -233,7 +233,16 @@ Qt for Windows CE
 
 
 - Designer
-
+ - [QTBUG-9351] Fixed a bug that caused modified headerview-properties
+   of item views to be duplicated in the UI-file.
+ - [QTBUG-8347] Fixed a layout problem caused by embedded images in the rich
+   text of a QLabel.
+ - [QTBUG-8041], [QTBUG-8213] Fixed a crash related to undo while moving
+   widgets by arrow keys.
+ - [QTBUG-7822] Added support for the 'windowOpacity'-property.
+ - [QTBUG-7764] Fixed the emission of the propertyChanged()-signal of
+   QDesignerPropertyEditorInterface.
+ - [QTBUG-5492] Made widgetbox-filter match on class names, too.
 
 - Linguist
   - Linguist GUI
@@ -251,9 +260,10 @@ Qt for Windows CE
 
 - uic
 
-
 - uic3
 
+ - [QTBUG-9207] Fixed export of image files of type XPM, added
+   compatibility option -limit-xpm-linelength.
 
 - qmake
 
diff --git a/doc/src/development/assistant-manual.qdoc b/doc/src/development/assistant-manual.qdoc
index 7d56ea1..afc6361 100644
--- a/doc/src/development/assistant-manual.qdoc
+++ b/doc/src/development/assistant-manual.qdoc
@@ -359,7 +359,7 @@
 
     The \menu{Options} page lets you specify the homepage \QA will display when
     you click the \gui{Home} button in \QA's main user interface. You can specify
-    the hompage by typing it here or clicking on one of the buttons below the
+    the homepage by typing it here or clicking on one of the buttons below the
     textbox. \gui{Current Page} sets the currently displayed page as your home
     page while \gui{Restore to default} will reset your home page to the default
     home page.
diff --git a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro
index e5d91b2..e5d91b2 100644
--- a/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicslayouts.pro
+++ b/examples/declarative/cppextensions/qgraphicslayouts/graphicsLayouts/graphicsLayouts.pro
diff --git a/examples/graphicsview/padnavigator/padnavigator.h b/examples/graphicsview/padnavigator/padnavigator.h
index 03a1ea2..d9298ae 100644
--- a/examples/graphicsview/padnavigator/padnavigator.h
+++ b/examples/graphicsview/padnavigator/padnavigator.h
@@ -45,10 +45,14 @@
 #include <QGraphicsView>
 #include "ui_form.h"
 
+QT_BEGIN_NAMESPACE
+
 class QState;
 class QStateMachine;
 class Ui_Form;
 
+QT_END_NAMESPACE
+
 //! [0]
 class PadNavigator : public QGraphicsView
 {
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h
index 531ac97..0b1c17d 100644
--- a/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@ -91,6 +91,7 @@ class QDeclarativeEngine;
 class QDeclarativeContextPrivate;
 class QDeclarativeExpression;
 class QDeclarativeContextScriptClass;
+class QDeclarativeImportDatabase;
 class QDeclarativeObjectScriptClass;
 class QDeclarativeTypeNameScriptClass;
 class QDeclarativeValueTypeScriptClass;
diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index 2359479..131fb85 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -565,6 +565,7 @@ void CentralWidget::connectSignals()
             SIGNAL(highlighted(QString)));
         connect(viewer, SIGNAL(sourceChanged(QUrl)), this,
             SLOT(setTabTitle(QUrl)));
+        connect(viewer, SIGNAL(printRequested()), this, SLOT(print()));
     }
 }
 
diff --git a/tools/assistant/tools/assistant/contentwindow.cpp b/tools/assistant/tools/assistant/contentwindow.cpp
index e0347c8..8afa1df 100644
--- a/tools/assistant/tools/assistant/contentwindow.cpp
+++ b/tools/assistant/tools/assistant/contentwindow.cpp
@@ -133,11 +133,13 @@ bool ContentWindow::eventFilter(QObject *o, QEvent *e)
     if (m_contentWidget && o == m_contentWidget->viewport()
         && e->type() == QEvent::MouseButtonRelease) {
         QMouseEvent *me = static_cast<QMouseEvent*>(e);
-        QModelIndex index = m_contentWidget->indexAt(me->pos());
-        QItemSelectionModel *sm = m_contentWidget->selectionModel();
+        const QModelIndex &index = m_contentWidget->indexAt(me->pos());
+        if (!index.isValid())
+            return QWidget::eventFilter(o, e);
 
-        Qt::MouseButtons button = me->button();
-        if (index.isValid() && (sm && sm->isSelected(index))) {
+        const Qt::MouseButtons button = me->button();
+        QItemSelectionModel *sm = m_contentWidget->selectionModel();
+        if (sm->isSelected(index)) {
             if ((button == Qt::LeftButton && (me->modifiers() & Qt::ControlModifier))
                 || (button == Qt::MidButton)) {
                 QHelpContentModel *contentModel =
@@ -189,9 +191,11 @@ void ContentWindow::itemClicked(const QModelIndex &index)
         qobject_cast<QHelpContentModel*>(m_contentWidget->model());
 
     if (contentModel) {
-        QHelpContentItem *itm = contentModel->contentItemAt(index);
-        if (itm)
-            emit linkActivated(itm->url());
+        if (QHelpContentItem *itm = contentModel->contentItemAt(index)) {
+            const QUrl &url = itm->url();
+            if (url != CentralWidget::instance()->currentSource())
+                emit linkActivated(url);
+        }
     }
 }
 
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
index adaa45b..244d091 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
@@ -269,6 +269,7 @@ HelpViewer::HelpViewer(CentralWidget *parent, qreal zoom)
         SIGNAL(highlighted(QString)));
     connect(this, SIGNAL(urlChanged(QUrl)), this, SIGNAL(sourceChanged(QUrl)));
     connect(this, SIGNAL(loadFinished(bool)), this, SLOT(setLoadFinished(bool)));
+    connect(page(), SIGNAL(printRequested(QWebFrame*)), this, SIGNAL(printRequested()));
 
     setFont(viewerFont());
     setTextSizeMultiplier(zoom == 0.0 ? 1.0 : zoom);
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.h b/tools/assistant/tools/assistant/helpviewer_qwv.h
index a2c0389..2577828 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.h
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.h
@@ -100,6 +100,7 @@ Q_SIGNALS:
     void backwardAvailable(bool enabled);
     void highlighted(const QString &);
     void sourceChanged(const QUrl &);
+    void printRequested();
 
 protected:
     virtual void wheelEvent(QWheelEvent *);