diff options
| author | Andy Shaw <qt-info@nokia.com> | 2010-06-21 10:08:26 (GMT) |
|---|---|---|
| committer | Andy Shaw <qt-info@nokia.com> | 2010-06-21 10:08:26 (GMT) |
| commit | 033fea2483945aa2ecb238751121098b594a1877 (patch) | |
| tree | f8a2b28e95640dab0e801037722e73b4633d0296 /examples/dbus/remotecontrolledcar/car/car.h | |
| parent | 1fb24d6852e34bd58f35172dea4bfd4c41236689 (diff) | |
| parent | 448dd8593f3e7e680ce3d0f92e279aad3c88d7d6 (diff) | |
| download | Qt-033fea2483945aa2ecb238751121098b594a1877.zip Qt-033fea2483945aa2ecb238751121098b594a1877.tar.gz Qt-033fea2483945aa2ecb238751121098b594a1877.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'examples/dbus/remotecontrolledcar/car/car.h')
| -rw-r--r-- | examples/dbus/remotecontrolledcar/car/car.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/examples/dbus/remotecontrolledcar/car/car.h b/examples/dbus/remotecontrolledcar/car/car.h index 5ef046e..c611018 100644 --- a/examples/dbus/remotecontrolledcar/car/car.h +++ b/examples/dbus/remotecontrolledcar/car/car.h @@ -41,14 +41,12 @@ #ifndef CAR_H #define CAR_H -#include <QGraphicsItem> -#include <QObject> +#include <QGraphicsObject> #include <QBrush> -class Car : public QObject, public QGraphicsItem +class Car : public QGraphicsObject { Q_OBJECT - public: Car(); QRectF boundingRect() const; |