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, 18 insertions, 7 deletions

diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp
index 42915b0..7d78aa7 100755
--- a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp
+++ b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp
@@ -38,9 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QTimer>
-#include <QTime>
 #include <QBrush>
+#include <QTime>
 #include "mymodel.h"
 
 //! [quoting mymodel_a]
diff --git a/examples/tutorials/modelview/5_edit/mainwindow.h b/examples/tutorials/modelview/5_edit/mainwindow.h
index ac5b77b..41b15d1 100755
--- a/examples/tutorials/modelview/5_edit/mainwindow.h
+++ b/examples/tutorials/modelview/5_edit/mainwindow.h
@@ -42,7 +42,11 @@
 #define MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
-#include <QtGui/QTableView>
+
+QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code
+class QTableView; //forward declaration
+QT_END_NAMESPACE
+
 
 class MainWindow : public QMainWindow
 {
diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h
index 4c4ddb0..16d3140 100755
--- a/examples/tutorials/modelview/6_treeview/mainwindow.h
+++ b/examples/tutorials/modelview/6_treeview/mainwindow.h
@@ -42,8 +42,12 @@
 #define MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
-#include <QtGui/QTreeView>
-#include <QtGui/QStandardItemModel>
+
+QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code
+class QTreeView; //forward declarations
+class QStandardItemModel;
+class QStandardItem;
+QT_END_NAMESPACE
 
 
 class MainWindow : public QMainWindow
diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h
index a8f8488..0d2dd0e 100755
--- a/examples/tutorials/modelview/7_selections/mainwindow.h
+++ b/examples/tutorials/modelview/7_selections/mainwindow.h
@@ -42,8 +42,12 @@
 #define MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
-#include <QtGui/QTreeView>
-#include <QtGui/QStandardItemModel>
+
+QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code
+class QTreeView; //forward declarations
+class QStandardItemModel;
+class QItemSelection;
+QT_END_NAMESPACE
 
 
 class MainWindow : public QMainWindow