diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
| commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
| tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /src/qtquick1/graphicsitems/qdeclarativeitem.h | |
| parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
| parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) | |
| download | qtdeclarative-animation-refactor.tar.gz | |
Merge branch 'master' into animation-refactorwip/animation-refactoranimation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'src/qtquick1/graphicsitems/qdeclarativeitem.h')
| -rw-r--r-- | src/qtquick1/graphicsitems/qdeclarativeitem.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qtquick1/graphicsitems/qdeclarativeitem.h b/src/qtquick1/graphicsitems/qdeclarativeitem.h index e372c9c8ad..e94f675c55 100644 --- a/src/qtquick1/graphicsitems/qdeclarativeitem.h +++ b/src/qtquick1/graphicsitems/qdeclarativeitem.h @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtDeclarative module of the Qt Toolkit. ** @@ -49,6 +49,7 @@ #include <QtCore/QList> #include <QtGui/qfont.h> #include <QtWidgets/qgraphicsitem.h> +#include <QtWidgets/qgraphicswidget.h> #include <QtWidgets/qgraphicstransform.h> #include <QtGui/qaccessible.h> #include <QtWidgets/qaction.h> @@ -57,7 +58,6 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -QT_MODULE(Declarative) class QDeclarative1State; class QDeclarative1AnchorLine; |