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/statemachine/tankgame | |
| 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/statemachine/tankgame')
| -rw-r--r-- | examples/statemachine/tankgame/gameitem.h | 2 | ||||
| -rw-r--r-- | examples/statemachine/tankgame/mainwindow.h | 3 | ||||
| -rw-r--r-- | examples/statemachine/tankgame/plugin.h | 4 | ||||
| -rw-r--r-- | examples/statemachine/tankgame/tankgame.pro | 30 |
4 files changed, 27 insertions, 12 deletions
diff --git a/examples/statemachine/tankgame/gameitem.h b/examples/statemachine/tankgame/gameitem.h index 43b8785..33caf71 100644 --- a/examples/statemachine/tankgame/gameitem.h +++ b/examples/statemachine/tankgame/gameitem.h @@ -3,7 +3,9 @@ #include <QGraphicsItem> +QT_BEGIN_NAMESPACE class QLineF; +QT_END_NAMESPACE class GameItem: public QObject, public QGraphicsItem { Q_OBJECT diff --git a/examples/statemachine/tankgame/mainwindow.h b/examples/statemachine/tankgame/mainwindow.h index 40e1595..391ab77 100644 --- a/examples/statemachine/tankgame/mainwindow.h +++ b/examples/statemachine/tankgame/mainwindow.h @@ -4,11 +4,14 @@ #include <QMainWindow> #include <QTime> +QT_BEGIN_NAMESPACE class QGraphicsScene; class QStateMachine; class QState; +QT_END_NAMESPACE class GameOverTransition; class TankItem; + class MainWindow: public QMainWindow { Q_OBJECT diff --git a/examples/statemachine/tankgame/plugin.h b/examples/statemachine/tankgame/plugin.h index 2b48d43..006ad78 100644 --- a/examples/statemachine/tankgame/plugin.h +++ b/examples/statemachine/tankgame/plugin.h @@ -3,7 +3,9 @@ #include <QtPlugin> +QT_BEGIN_NAMESPACE class QState; +QT_END_NAMESPACE class Plugin { public: @@ -12,6 +14,8 @@ public: virtual QState *create(QState *parentState, QObject *tank) = 0; }; +QT_BEGIN_NAMESPACE Q_DECLARE_INTERFACE(Plugin, "TankPlugin") +QT_END_NAMESPACE #endif diff --git a/examples/statemachine/tankgame/tankgame.pro b/examples/statemachine/tankgame/tankgame.pro index 46cfe2e..59415be 100644 --- a/examples/statemachine/tankgame/tankgame.pro +++ b/examples/statemachine/tankgame/tankgame.pro @@ -1,13 +1,19 @@ -###################################################################### -# Automatically generated by qmake (2.01a) on 22. apr 14:11:33 2009 -###################################################################### - -TEMPLATE = app -TARGET = -DEPENDPATH += . -INCLUDEPATH += C:/dev/kinetic/examples/statemachine/tankgame/. . - -# Input -HEADERS += mainwindow.h plugin.h tankitem.h rocketitem.h gameitem.h gameovertransition.h -SOURCES += main.cpp mainwindow.cpp tankitem.cpp rocketitem.cpp gameitem.cpp gameovertransition.cpp +HEADERS += mainwindow.h \ + plugin.h \ + tankitem.h \ + rocketitem.h \ + gameitem.h \ + gameovertransition.h +SOURCES += main.cpp \ + mainwindow.cpp \ + tankitem.cpp \ + rocketitem.cpp \ + gameitem.cpp \ + gameovertransition.cpp CONFIG += console + +# install +target.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tankgame.pro +sources.path = $$[QT_INSTALL_EXAMPLES]/statemachine/tankgame +INSTALLS += target sources |