diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-03 22:59:58 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-03 22:59:58 (GMT) |
| commit | 436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f (patch) | |
| tree | 9fa98ed5eea2a806ef4e949f8d95a0f25e6c4be1 /src/declarative/graphicsitems/qmlgraphicsitem.cpp | |
| parent | 5ec35c0756464ec512de0961c2ae41bec39ac2f7 (diff) | |
| parent | 4621061e8c32e234a0d7688e226e92d87172f99b (diff) | |
| download | Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.zip Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.tar.gz Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/graphicsitems/qmlgraphicsitem.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicsitem.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp index a858d87..68a565d 100644 --- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp +++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp @@ -39,6 +39,19 @@ ** ****************************************************************************/ +#include "qmlgraphicsitem_p.h" +#include "qmlgraphicsitem.h" + +#include "qmlgraphicsevents_p_p.h" + +#include <qfxperf_p_p.h> +#include <qmlengine.h> +#include <qmlopenmetaobject_p.h> +#include <qmlstate_p.h> +#include <qmlview.h> +#include <qmlstategroup_p.h> +#include <qmlcomponent.h> + #include <QDebug> #include <QPen> #include <QFile> @@ -47,22 +60,9 @@ #include <QNetworkRequest> #include <QGraphicsSceneMouseEvent> #include <QtScript/qscriptengine.h> -#include <private/qfxperf_p_p.h> #include <QtGui/qgraphicstransform.h> #include <QtGui/qgraphicseffect.h> - -#include <qmlengine.h> -#include <private/qmlopenmetaobject_p.h> -#include <private/qmlstate_p.h> -#include <private/qlistmodelinterface_p.h> - -#include "qmlview.h" -#include <private/qmlstategroup_p.h> - -#include <private/qmlgraphicsitem_p.h> -#include "qmlgraphicsitem.h" -#include <private/qmlgraphicsevents_p_p.h> -#include <qmlcomponent.h> +#include <qlistmodelinterface_p.h> QT_BEGIN_NAMESPACE @@ -3034,8 +3034,8 @@ int QmlGraphicsItemPrivate::restart(QTime &t) return n; } -#include "qmlgraphicsitem.moc" -#include "moc_qmlgraphicsitem.cpp" +#include <qmlgraphicsitem.moc> +#include <moc_qmlgraphicsitem.cpp> QT_END_NAMESPACE |