diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-04-29 12:23:54 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-04-29 12:23:54 (GMT) |
| commit | eea1c9f34b9b98c55c48f9ed1dbef9a9883c6f2a (patch) | |
| tree | 2710760fe8a79cdeda9555debd6d520d6cee9a96 /examples/animation/sub-attaq/mainwindow.h | |
| parent | 20702b4a5992a87e8edc40949ea80fa625a3fc8c (diff) | |
| parent | 36aa9e0468bfa874679dd94b2d50850a1dd7a1d1 (diff) | |
| download | Qt-eea1c9f34b9b98c55c48f9ed1dbef9a9883c6f2a.zip Qt-eea1c9f34b9b98c55c48f9ed1dbef9a9883c6f2a.tar.gz Qt-eea1c9f34b9b98c55c48f9ed1dbef9a9883c6f2a.tar.bz2 | |
Merge branch 'kinetic-animations' into kinetic-statemachine
Conflicts:
examples/animation/sub-attaq/states.cpp
Diffstat (limited to 'examples/animation/sub-attaq/mainwindow.h')
| -rw-r--r-- | examples/animation/sub-attaq/mainwindow.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/animation/sub-attaq/mainwindow.h b/examples/animation/sub-attaq/mainwindow.h index 6289b3f..72d1324 100644 --- a/examples/animation/sub-attaq/mainwindow.h +++ b/examples/animation/sub-attaq/mainwindow.h @@ -43,7 +43,7 @@ #define __MAINWINDOW__H__ //Qt -#include <QMainWindow> +#include <QtGui/QMainWindow> class GraphicsScene; class QGraphicsView; |