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: (25 commits)
  Recognize @, #, $ and ` as word separators
  rebuild configure.exe
  Fix dependencies so JOM will handle parallellization properly
  Symbian: Disable IPv6 for now
  Doc: Fixed namespaced Qt build breakage in the model/view tutorial.
  Doc: Fixing links on index page and corecting HTML in the template.
  Accept empty authority segments in QUrl as different from not-present
  Doc: Adds line about non-support for Webkit on Solaris
  protect nil dictionary from release.
  Fix potential KERN-EXEC 0 on Symbian.
  Ukrainian translation updated
  Fix remote crash in delivering D-Bus calls with too few arguments
  Ensure that OpenGL contexts are attached to an NSView before first paint
  Doc: Updating the 3rd party lib used in Qt - including JQuery
  Doc: Changed the default URL to avoid a Flash plugin crash on x86-64.
  Reduce memory consumption of QtScript/JSC on Symbian
  Doc: Updated Supported Platforms page. Finished
  New binary of configure.exe with -mp/-no-mp option
  Turn Makefile.win32 into batch-mode, enable /MP and PCH
  Add option to enable -MP compile option for MSVC
  ...

4 files changed, 6 insertions, 12 deletions

diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.h b/examples/tutorials/modelview/3_changingmodel/mymodel.h
index 47b026e..87c3dba 100755
--- a/examples/tutorials/modelview/3_changingmodel/mymodel.h
+++ b/examples/tutorials/modelview/3_changingmodel/mymodel.h
@@ -42,8 +42,7 @@
 #define MYMODEL_H
 
 #include <QAbstractTableModel>
-
-class QTimer;  // forward declaration
+#include <QTimer>
 
 class MyModel : public QAbstractTableModel
 {
diff --git a/examples/tutorials/modelview/5_edit/mainwindow.h b/examples/tutorials/modelview/5_edit/mainwindow.h
index 1d49f47..ac5b77b 100755
--- a/examples/tutorials/modelview/5_edit/mainwindow.h
+++ b/examples/tutorials/modelview/5_edit/mainwindow.h
@@ -42,8 +42,7 @@
 #define MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
-
-class QTableView; //forward declaration
+#include <QtGui/QTableView>
 
 class MainWindow : public QMainWindow
 {
diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h
index fb8de79..4c4ddb0 100755
--- a/examples/tutorials/modelview/6_treeview/mainwindow.h
+++ b/examples/tutorials/modelview/6_treeview/mainwindow.h
@@ -42,10 +42,8 @@
 #define MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
-
-class QTreeView; //forward declaration
-class QStandardItemModel;
-class QStandardItem;
+#include <QtGui/QTreeView>
+#include <QtGui/QStandardItemModel>
 
 
 class MainWindow : public QMainWindow
diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h
index f2defb5..a8f8488 100755
--- a/examples/tutorials/modelview/7_selections/mainwindow.h
+++ b/examples/tutorials/modelview/7_selections/mainwindow.h
@@ -42,10 +42,8 @@
 #define MAINWINDOW_H
 
 #include <QtGui/QMainWindow>
-
-class QTreeView; //forward declaration
-class QStandardItemModel;
-class QItemSelection;
+#include <QtGui/QTreeView>
+#include <QtGui/QStandardItemModel>
 
 
 class MainWindow : public QMainWindow