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:
  Examples: Fix compilation with namespace.
  Rebuilt configure.exe
  Make configure.exe accept -no-gif again, fix comment

11 files changed, 14 insertions, 10 deletions

diff --git a/configure b/configure
index fb544bd..11496c4 100755
--- a/configure
+++ b/configure
@@ -3636,7 +3636,7 @@ Third Party Libraries:
 
     -no-gif ............ Do not compile GIF reading support.
  *  -qt-gif ............ Compile GIF reading support.
-                         See also src/gui/image/qgifhandler.h
+                         See also src/gui/image/qgifhandler_p.h
 
     -no-libtiff ........ Do not compile TIFF support.
     -qt-libtiff ........ Use the libtiff bundled with Qt.
diff --git a/configure.exe b/configure.exe
index 0863ecc..104923b 100755
--- a/configure.exe
+++ b/configure.exe
diff --git a/examples/tutorials/modelview/1_readonly/modelview.h b/examples/tutorials/modelview/1_readonly/modelview.h
index 9307083..cc14d90 100755
--- a/examples/tutorials/modelview/1_readonly/modelview.h
+++ b/examples/tutorials/modelview/1_readonly/modelview.h
@@ -45,7 +45,7 @@
 // modelview.h
 #include <QtGui/QMainWindow>
 
-class QTableView; //forward declaration
+QT_FORWARD_DECLARE_CLASS(QTableView)
 
 class ModelView : public QMainWindow
 {
diff --git a/examples/tutorials/modelview/2_formatting/modelview.h b/examples/tutorials/modelview/2_formatting/modelview.h
index 7291487..b2943ac 100755
--- a/examples/tutorials/modelview/2_formatting/modelview.h
+++ b/examples/tutorials/modelview/2_formatting/modelview.h
@@ -43,7 +43,7 @@
 
 #include <QtGui/QMainWindow>
 
-class QTableView; //forward declaration
+QT_FORWARD_DECLARE_CLASS(QTableView)
 
 class ModelView : public QMainWindow
 {
diff --git a/examples/tutorials/modelview/3_changingmodel/modelview.h b/examples/tutorials/modelview/3_changingmodel/modelview.h
index 7291487..b2943ac 100755
--- a/examples/tutorials/modelview/3_changingmodel/modelview.h
+++ b/examples/tutorials/modelview/3_changingmodel/modelview.h
@@ -43,7 +43,7 @@
 
 #include <QtGui/QMainWindow>
 
-class QTableView; //forward declaration
+QT_FORWARD_DECLARE_CLASS(QTableView)
 
 class ModelView : public QMainWindow
 {
diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.h b/examples/tutorials/modelview/3_changingmodel/mymodel.h
index 47b026e..01ad88d 100755
--- a/examples/tutorials/modelview/3_changingmodel/mymodel.h
+++ b/examples/tutorials/modelview/3_changingmodel/mymodel.h
@@ -43,7 +43,7 @@
 
 #include <QAbstractTableModel>
 
-class QTimer;  // forward declaration
+QT_FORWARD_DECLARE_CLASS(QTimer)
 
 class MyModel : public QAbstractTableModel
 {
diff --git a/examples/tutorials/modelview/4_headers/modelview.h b/examples/tutorials/modelview/4_headers/modelview.h
index 7669e35..03f99c0 100755
--- a/examples/tutorials/modelview/4_headers/modelview.h
+++ b/examples/tutorials/modelview/4_headers/modelview.h
@@ -43,7 +43,7 @@
 
 #include <QtGui/QMainWindow>
 
-class QTableView; //forward declaration
+QT_FORWARD_DECLARE_CLASS(QTableView)
 
 class ModelView : public QMainWindow
 {
diff --git a/examples/tutorials/modelview/5_edit/modelview.h b/examples/tutorials/modelview/5_edit/modelview.h
index 97c840c..069107b 100755
--- a/examples/tutorials/modelview/5_edit/modelview.h
+++ b/examples/tutorials/modelview/5_edit/modelview.h
@@ -43,7 +43,7 @@
 
 #include <QtGui/QMainWindow>
 
-class QTableView; //forward declaration
+QT_FORWARD_DECLARE_CLASS(QTableView)
 
 class ModelView : public QMainWindow
 {
diff --git a/examples/tutorials/modelview/6_treeview/modelview.h b/examples/tutorials/modelview/6_treeview/modelview.h
index a47111c..55f3470 100755
--- a/examples/tutorials/modelview/6_treeview/modelview.h
+++ b/examples/tutorials/modelview/6_treeview/modelview.h
@@ -43,10 +43,11 @@
 
 #include <QtGui/QMainWindow>
 
+QT_BEGIN_NAMESPACE
 class QTreeView; //forward declaration
 class QStandardItemModel;
 class QStandardItem;
-
+QT_END_NAMESPACE
 
 class ModelView : public QMainWindow
 {
diff --git a/examples/tutorials/modelview/7_selections/modelview.h b/examples/tutorials/modelview/7_selections/modelview.h
index 5229ac3..d20797e 100755
--- a/examples/tutorials/modelview/7_selections/modelview.h
+++ b/examples/tutorials/modelview/7_selections/modelview.h
@@ -43,10 +43,11 @@
 
 #include <QtGui/QMainWindow>
 
+QT_BEGIN_NAMESPACE
 class QTreeView; //forward declaration
 class QStandardItemModel;
 class QItemSelection;
-
+QT_END_NAMESPACE
 
 class ModelView : public QMainWindow
 {
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 7f2d53b..c3498e3 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -581,6 +581,8 @@ void Configure::parseCmdLine()
         // Image formats --------------------------------------------
         else if (configCmdLine.at(i) == "-no-gif")
             dictionary[ "GIF" ] = "no";
+	else if (configCmdLine.at(i) == "-qt-gif")
+            dictionary[ "GIF" ] = "yes";
 
         else if (configCmdLine.at(i) == "-no-libtiff") {
             dictionary[ "TIFF"] = "no";
@@ -1741,7 +1743,7 @@ bool Configure::displayHelp()
         desc("ZLIB", "system",  "-system-zlib",         "Use zlib from the operating system.\nSee http://www.gzip.org/zlib\n");
 
         desc("GIF", "no",       "-no-gif",              "Do not compile GIF reading support.");
-        desc("GIF", "auto",     "-qt-gif",              "Compile GIF reading support.\nSee also src/gui/image/qgifhandler.h\n");
+        desc("GIF", "auto",     "-qt-gif",              "Compile GIF reading support.\nSee also src/gui/image/qgifhandler_p.h\n");
 
         desc("LIBPNG", "no",    "-no-libpng",           "Do not compile PNG support.");
         desc("LIBPNG", "qt",    "-qt-libpng",           "Use the libpng bundled with Qt.");