diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-05-20 13:34:11 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-05-20 13:34:11 (GMT) |
| commit | ac5fceafb00a2f007239f9b0fc89fe01a2064d62 (patch) | |
| tree | dbce8727cf7599c07e8151e7993b59cd5f3e40a6 /examples/animation/stickman | |
| parent | 5504a102e9f608fed7377332b8de7b823cf22b85 (diff) | |
| download | Qt-ac5fceafb00a2f007239f9b0fc89fe01a2064d62.zip Qt-ac5fceafb00a2f007239f9b0fc89fe01a2064d62.tar.gz Qt-ac5fceafb00a2f007239f9b0fc89fe01a2064d62.tar.bz2 | |
compile with -qtnamespace, clean up the example .pro files
Diffstat (limited to 'examples/animation/stickman')
| -rw-r--r-- | examples/animation/stickman/animation.h | 2 | ||||
| -rw-r--r-- | examples/animation/stickman/editor/animationdialog.h | 2 | ||||
| -rw-r--r-- | examples/animation/stickman/lifecycle.h | 2 | ||||
| -rw-r--r-- | examples/animation/stickman/stickman.h | 2 | ||||
| -rw-r--r-- | examples/animation/stickman/stickman.pro | 27 |
5 files changed, 24 insertions, 11 deletions
diff --git a/examples/animation/stickman/animation.h b/examples/animation/stickman/animation.h index e6c375e..b0b39c9 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 764cdaf..6025088 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 8fd0fb2..2be4762 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 46863a3..6395272 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 bfee5b0..956b49c 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 |