diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-07-20 03:42:59 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-07-20 03:42:59 (GMT) |
| commit | 2b55d441c6ef87a641d7e7c13ed2e766c6211829 (patch) | |
| tree | 6a9b3d63f5e007c4402573b198147aceeaa47ba6 /src/gui | |
| parent | 7b1484e05a28c20a993efe0c2ec42ae25cbff13f (diff) | |
| parent | bd25c0401644e1a1f443532c3e2a75201422b255 (diff) | |
| download | Qt-2b55d441c6ef87a641d7e7c13ed2e766c6211829.zip Qt-2b55d441c6ef87a641d7e7c13ed2e766c6211829.tar.gz Qt-2b55d441c6ef87a641d7e7c13ed2e766c6211829.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem.h | 1 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsitem_p.h | 1 | ||||
| -rw-r--r-- | src/gui/graphicsview/qgraphicsscene_p.h | 1 |
3 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h index ba03987..7240eaa 100644 --- a/src/gui/graphicsview/qgraphicsitem.h +++ b/src/gui/graphicsview/qgraphicsitem.h @@ -48,6 +48,7 @@ #include <QtCore/qrect.h> #include <QtGui/qpainterpath.h> #include <QtGui/qpixmap.h> +#include <QtGui/qstyleoption.h> class tst_QGraphicsItem; diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 7204d7f..d14ae7f 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -56,7 +56,6 @@ #include "qgraphicsitem.h" #include "qset.h" #include "qpixmapcache.h" -#include "qgraphicsview_p.h" #include <QtCore/qpoint.h> diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index ff7e8c6..fc8fa2b 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -59,6 +59,7 @@ #include "qgraphicssceneevent.h" #include "qgraphicsview.h" +#include "qgraphicsview_p.h" #include "qgraphicsitem_p.h" #include <private/qobject_p.h> |