diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-29 01:01:07 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-29 01:01:07 (GMT) |
| commit | b3d030df07ba59059e3d6ecf6e1967cbf1f30d49 (patch) | |
| tree | e0a939a1381c2b983c7fdc79c5f116f87b3a3bc6 /src/gui/graphicsview/graphicsview.pri | |
| parent | 93ad359f93de72ef8c4d5f0073dc20ba22b9023c (diff) | |
| parent | a6ea9ce6990003856ecadcca8ce9ddf37949363d (diff) | |
| download | Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.zip Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.tar.gz Qt-b3d030df07ba59059e3d6ecf6e1967cbf1f30d49.tar.bz2 | |
Merge branch 'master' of ../qt into kinetic-declarativeui
Conflicts:
configure.exe
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/widgets/qlineedit.cpp
Diffstat (limited to 'src/gui/graphicsview/graphicsview.pri')
| -rw-r--r-- | src/gui/graphicsview/graphicsview.pri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/graphicsview/graphicsview.pri b/src/gui/graphicsview/graphicsview.pri index 0c0747e..9d232e4 100644 --- a/src/gui/graphicsview/graphicsview.pri +++ b/src/gui/graphicsview/graphicsview.pri @@ -16,12 +16,13 @@ HEADERS += graphicsview/qgraphicsgridlayout.h \ graphicsview/qgraphicssceneevent.h \ graphicsview/qgraphicssceneindex_p.h \ graphicsview/qgraphicsscenelinearindex_p.h \ + graphicsview/qgraphicstransform.h \ + graphicsview/qgraphicstransform_p.h \ graphicsview/qgraphicsview.h \ graphicsview/qgraphicsview_p.h \ graphicsview/qgraphicswidget.h \ graphicsview/qgraphicswidget_p.h \ graphicsview/qgridlayoutengine_p.h - SOURCES += graphicsview/qgraphicsgridlayout.cpp \ graphicsview/qgraphicsitem.cpp \ graphicsview/qgraphicsitemanimation.cpp \ @@ -36,6 +37,7 @@ SOURCES += graphicsview/qgraphicsgridlayout.cpp \ graphicsview/qgraphicssceneevent.cpp \ graphicsview/qgraphicssceneindex.cpp \ graphicsview/qgraphicsscenelinearindex.cpp \ + graphicsview/qgraphicstransform.cpp \ graphicsview/qgraphicsview.cpp \ graphicsview/qgraphicswidget.cpp \ graphicsview/qgraphicswidget_p.cpp \ |