compile with -qtnamespace, clean up the example .pro files

23 files changed, 78 insertions, 59 deletions

diff --git a/examples/animation/animatedtiles/animatedtiles.pro b/examples/animation/animatedtiles/animatedtiles.pro
index 9e9062c004..1840b17b02 100644
--- a/examples/animation/animatedtiles/animatedtiles.pro
+++ b/examples/animation/animatedtiles/animatedtiles.pro
@@ -1,2 +1,8 @@
-SOURCES += main.cpp
-RESOURCES += animatedtiles.qrc
+SOURCES = main.cpp
+RESOURCES = animatedtiles.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/animation/animatedtiles
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animatedtiles.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/animation/animatedtiles
+INSTALLS += target sources
diff --git a/examples/animation/animatedtiles/main.cpp b/examples/animation/animatedtiles/main.cpp
index 7988758ee0..4b1d99d81f 100644
--- a/examples/animation/animatedtiles/main.cpp
+++ b/examples/animation/animatedtiles/main.cpp
@@ -132,6 +132,8 @@ protected:
 
 int main(int argc, char **argv)
 {
+    Q_INIT_RESOURCE(animatedtiles);
+
     QApplication app(argc, argv);
 
     QPixmap kineticPix(":/images/kinetic.png");
diff --git a/examples/animation/appchooser/appchooser.pro b/examples/animation/appchooser/appchooser.pro
index 8cda19ad96..847b60adf2 100644
--- a/examples/animation/appchooser/appchooser.pro
+++ b/examples/animation/appchooser/appchooser.pro
@@ -1,6 +1,5 @@
-# Input
-SOURCES += main.cpp
-RESOURCES += appchooser.qrc
+SOURCES = main.cpp
+RESOURCES = appchooser.qrc
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/animation/appchooser
diff --git a/examples/animation/easing/easing.pro b/examples/animation/easing/easing.pro
index fa5b22dcda..8e8a35f75b 100644
--- a/examples/animation/easing/easing.pro
+++ b/examples/animation/easing/easing.pro
@@ -1,16 +1,14 @@
-######################################################################
-# Automatically generated by qmake (2.01a) to 2. okt 23:22:11 2008
-######################################################################
+HEADERS = window.h \
+          animation.h
+SOURCES = main.cpp \
+          window.cpp
 
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
+FORMS   = form.ui
 
-# Input
-HEADERS += window.h animation.h
-SOURCES += main.cpp window.cpp
+RESOURCES     = easing.qrc
 
-FORMS   += form.ui
-
-RESOURCES     = resources.qrc
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/animation/easing
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS easing.pro images
+sources.path = $$[QT_INSTALL_EXAMPLES]/animation/easing
+INSTALLS += target sources
diff --git a/examples/animation/easing/resources.qrc b/examples/animation/easing/easing.qrc
index 7e112d3a9d..7e112d3a9d 100644
--- a/examples/animation/easing/resources.qrc
+++ b/examples/animation/easing/easing.qrc
diff --git a/examples/animation/easing/main.cpp b/examples/animation/easing/main.cpp
index 487fa860ce..bd10df28c5 100644
--- a/examples/animation/easing/main.cpp
+++ b/examples/animation/easing/main.cpp
@@ -44,6 +44,7 @@
 
 int main(int argc, char **argv)
 {
+    Q_INIT_RESOURCE(easing);
     QApplication app(argc, argv);
     Window w;
     w.resize(400, 400);
diff --git a/examples/animation/moveblocks/moveblocks.pro b/examples/animation/moveblocks/moveblocks.pro
index 7a82ca557d..b8e88b2008 100644
--- a/examples/animation/moveblocks/moveblocks.pro
+++ b/examples/animation/moveblocks/moveblocks.pro
@@ -1,8 +1,7 @@
-# Input
-SOURCES += main.cpp
+SOURCES = main.cpp
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/animation/moveblocks
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS moveblocks.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/animation/moveblocks
 INSTALLS += target sources
diff --git a/examples/animation/padnavigator-ng/padnavigator.pro b/examples/animation/padnavigator-ng/padnavigator.pro
index 0d094c620a..8e53a6dd2b 100644
--- a/examples/animation/padnavigator-ng/padnavigator.pro
+++ b/examples/animation/padnavigator-ng/padnavigator.pro
@@ -1,24 +1,24 @@
-HEADERS += \
+HEADERS = \
         panel.h \
         roundrectitem.h \
         splashitem.h
 
-SOURCES += \
+SOURCES = \
         panel.cpp \
         roundrectitem.cpp \
         splashitem.cpp \
         main.cpp
 
-RESOURCES += \
+RESOURCES = \
         padnavigator.qrc
 
-FORMS += \
+FORMS = \
         backside.ui
 
 contains(QT_CONFIG, opengl):QT += opengl
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/padnavigator
+target.path = $$[QT_INSTALL_EXAMPLES]/animation/padnavigator-ng
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS padnavigator.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/graphicsview/padnavigator
+sources.path = $$[QT_INSTALL_EXAMPLES]/animation/padnavigator-ng
 INSTALLS += target sources
diff --git a/examples/animation/padnavigator-ng/panel.h b/examples/animation/padnavigator-ng/panel.h
index 8ad95d91d2..9aca29ddfb 100644
--- a/examples/animation/padnavigator-ng/panel.h
+++ b/examples/animation/padnavigator-ng/panel.h
@@ -44,11 +44,11 @@
 
 QT_BEGIN_NAMESPACE
 class Ui_BackSide;
+class QAnimationGroup;
+class QPropertyAnimation;
 QT_END_NAMESPACE;
 
 class RoundRectItem;
-class QAnimationGroup;
-class QPropertyAnimation;
 
 class Panel : public QGraphicsView
 {
diff --git a/examples/animation/padnavigator-ng/roundrectitem.cpp b/examples/animation/padnavigator-ng/roundrectitem.cpp
index 7e7d4232a3..2ff216c070 100644
--- a/examples/animation/padnavigator-ng/roundrectitem.cpp
+++ b/examples/animation/padnavigator-ng/roundrectitem.cpp
@@ -45,9 +45,9 @@
 
 RoundRectItem::RoundRectItem(const QRectF &rect, const QBrush &brush, QWidget *embeddedWidget)
     : QGraphicsWidget(),
+      m_rect(rect),
       brush(brush),
-      proxyWidget(0),
-      m_rect(rect)
+      proxyWidget(0)
 {
     if (embeddedWidget) {
         proxyWidget = new QGraphicsProxyWidget(this);
diff --git a/examples/animation/stickman/animation.h b/examples/animation/stickman/animation.h
index e6c375e2d2..b0b39c9627 100644
--- a/examples/animation/stickman/animation.h
+++ b/examples/animation/stickman/animation.h
@@ -47,7 +47,9 @@
 #include <QString>
 
 class Frame;
+QT_BEGIN_NAMESPACE
 class QIODevice;
+QT_END_NAMESPACE
 class Animation
 {
 public:
diff --git a/examples/animation/stickman/editor/animationdialog.h b/examples/animation/stickman/editor/animationdialog.h
index 764cdafd37..6025088ef2 100644
--- a/examples/animation/stickman/editor/animationdialog.h
+++ b/examples/animation/stickman/editor/animationdialog.h
@@ -45,8 +45,10 @@
 #include <QDialog>
 #include <QMessageBox>
 
+QT_BEGIN_NAMESPACE
 class QSpinBox;
 class QLineEdit;
+QT_END_NAMESPACE
 class StickMan;
 class Animation;
 class AnimationDialog: public QDialog
diff --git a/examples/animation/stickman/lifecycle.h b/examples/animation/stickman/lifecycle.h
index 8fd0fb283e..2be47625fd 100644
--- a/examples/animation/stickman/lifecycle.h
+++ b/examples/animation/stickman/lifecycle.h
@@ -45,11 +45,13 @@
 #include <Qt>
 
 class StickMan;
+QT_BEGIN_NAMESPACE
 class QStateMachine;
 class QAnimationGroup;
 class QState;
 class QAbstractState;
 class QAbstractTransition;
+QT_END_NAMESPACE
 class GraphicsView;
 class LifeCycle
 {
diff --git a/examples/animation/stickman/stickman.h b/examples/animation/stickman/stickman.h
index 46863a3d34..639527252f 100644
--- a/examples/animation/stickman/stickman.h
+++ b/examples/animation/stickman/stickman.h
@@ -47,7 +47,9 @@
 const int LimbCount = 16;
 
 class Node;
+QT_BEGIN_NAMESPACE
 class QTimer;
+QT_END_NAMESPACE
 class StickMan: public QObject, public QGraphicsItem
 {
     Q_OBJECT
diff --git a/examples/animation/stickman/stickman.pro b/examples/animation/stickman/stickman.pro
index bfee5b0017..956b49cc4e 100644
--- a/examples/animation/stickman/stickman.pro
+++ b/examples/animation/stickman/stickman.pro
@@ -1,14 +1,19 @@
-######################################################################
-# Automatically generated by qmake (2.01a) ti 3. feb 19:50:14 2009
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
+HEADERS += stickman.h \
+           animation.h \
+           node.h \
+           lifecycle.h \
+           graphicsview.h
+SOURCES += main.cpp \
+           stickman.cpp \
+           animation.cpp \
+           node.cpp \
+           lifecycle.cpp \
+           graphicsview.cpp
 
 include(editor/editor.pri)
 
-# Input
-HEADERS += stickman.h animation.h node.h lifecycle.h graphicsview.h
-SOURCES += main.cpp stickman.cpp animation.cpp node.cpp lifecycle.cpp graphicsview.cpp
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/animation/stickman
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro
+sources.path = $$[QT_INSTALL_EXAMPLES]/animation/stickman
+INSTALLS += target sources
diff --git a/examples/animation/sub-attaq/animationmanager.h b/examples/animation/sub-attaq/animationmanager.h
index 69ec3d7a06..a563c962be 100644
--- a/examples/animation/sub-attaq/animationmanager.h
+++ b/examples/animation/sub-attaq/animationmanager.h
@@ -44,7 +44,9 @@
 
 #include <QtCore/QObject>
 
+QT_BEGIN_NAMESPACE
 class QAbstractAnimation;
+QT_END_NAMESPACE
 
 class AnimationManager : public QObject
 {
diff --git a/examples/animation/sub-attaq/boat.h b/examples/animation/sub-attaq/boat.h
index f16074ec58..08a9fa26d5 100644
--- a/examples/animation/sub-attaq/boat.h
+++ b/examples/animation/sub-attaq/boat.h
@@ -50,9 +50,11 @@
 
 class PixmapItem;
 class Bomb;
+QT_BEGIN_NAMESPACE
 class QVariantAnimation;
 class QAbstractAnimation;
 class QStateMachine;
+QT_END_NAMESPACE
 
 class Boat : public QGraphicsWidget
 {
diff --git a/examples/animation/sub-attaq/custompropertyanimation.cpp b/examples/animation/sub-attaq/custompropertyanimation.cpp
index f7ab269046..8226ccac39 100644
--- a/examples/animation/sub-attaq/custompropertyanimation.cpp
+++ b/examples/animation/sub-attaq/custompropertyanimation.cpp
@@ -44,9 +44,6 @@
 // Qt
 #include <QtCore/qdebug.h>
 
-QT_BEGIN_NAMESPACE
-
-
 CustomPropertyAnimation::CustomPropertyAnimation(QObject *parent) :
     QVariantAnimation(parent), animProp(0)
 {
@@ -108,8 +105,4 @@ void CustomPropertyAnimation::updateState(QAbstractAnimation::State oldState, QA
     QVariantAnimation::updateState(oldState, newState);
 }
 
-
-
 #include "moc_custompropertyanimation.cpp"
-
-QT_END_NAMESPACE
diff --git a/examples/animation/sub-attaq/custompropertyanimation.h b/examples/animation/sub-attaq/custompropertyanimation.h
index 1dca454b25..8654aebc54 100644
--- a/examples/animation/sub-attaq/custompropertyanimation.h
+++ b/examples/animation/sub-attaq/custompropertyanimation.h
@@ -44,7 +44,9 @@
 
 #include <QtCore/qvariantanimation.h>
 
+QT_BEGIN_NAMESPACE
 class QGraphicsItem;
+QT_END_NAMESPACE
 
 struct AbstractProperty
 {
diff --git a/examples/animation/sub-attaq/graphicsscene.h b/examples/animation/sub-attaq/graphicsscene.h
index 70c873ef4d..8b0ea96675 100644
--- a/examples/animation/sub-attaq/graphicsscene.h
+++ b/examples/animation/sub-attaq/graphicsscene.h
@@ -54,7 +54,9 @@ class Torpedo;
 class Bomb;
 class PixmapItem;
 class ProgressItem;
+QT_BEGIN_NAMESPACE
 class QAction;
+QT_END_NAMESPACE
 
 class GraphicsScene : public QGraphicsScene
 {
diff --git a/examples/animation/sub-attaq/mainwindow.h b/examples/animation/sub-attaq/mainwindow.h
index 72d1324821..87f194ac7e 100644
--- a/examples/animation/sub-attaq/mainwindow.h
+++ b/examples/animation/sub-attaq/mainwindow.h
@@ -44,9 +44,10 @@
 
 //Qt
 #include <QtGui/QMainWindow>
-
 class GraphicsScene;
+QT_BEGIN_NAMESPACE
 class QGraphicsView;
+QT_END_NAMESPACE
 
 class MainWindow : public QMainWindow
 {
diff --git a/examples/animation/sub-attaq/states.h b/examples/animation/sub-attaq/states.h
index 3203b3ba6a..71375e0dd2 100644
--- a/examples/animation/sub-attaq/states.h
+++ b/examples/animation/sub-attaq/states.h
@@ -52,7 +52,9 @@
 class GraphicsScene;
 class Boat;
 class SubMarine;
+QT_BEGIN_NAMESPACE
 class QStateMachine;
+QT_END_NAMESPACE
 
 class PlayState : public QState
 {
diff --git a/examples/animation/sub-attaq/sub-attaq.pro b/examples/animation/sub-attaq/sub-attaq.pro
index 961a9b5dd7..d13a0998b6 100644
--- a/examples/animation/sub-attaq/sub-attaq.pro
+++ b/examples/animation/sub-attaq/sub-attaq.pro
@@ -1,14 +1,5 @@
-# #####################################################################
-# Automatically generated by qmake (2.01a) Thu Oct 9 10:53:30 2008
-# #####################################################################
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-QT += xml
 contains(QT_CONFIG, opengl):QT += opengl
 
-# Input
 HEADERS += boat.h \
     bomb.h \
     mainwindow.h \
@@ -37,3 +28,9 @@ SOURCES += boat.cpp \
     qanimationstate.cpp \
     progressitem.cpp
 RESOURCES += subattaq.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/animation/sub-attaq
+sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sub-attaq.pro pics
+sources.path = $$[QT_INSTALL_EXAMPLES]/animation/sub-attaq
+INSTALLS += target sources