diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-08-21 07:06:09 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-08-21 07:06:09 (GMT) |
| commit | c7e2ad82ea4cd999e568e2819dea10bf7214eee3 (patch) | |
| tree | 41ec4c2e65dae6284f42f7676ba32fe46594ea8d /src/gui/graphicsview/graphicsview.pri | |
| parent | f11fc8f62558543dac1eca9d52a4801196c55221 (diff) | |
| parent | 926f5ad207fb04fdeb09c0b696dce3c072e47e75 (diff) | |
| download | Qt-c7e2ad82ea4cd999e568e2819dea10bf7214eee3.zip Qt-c7e2ad82ea4cd999e568e2819dea10bf7214eee3.tar.gz Qt-c7e2ad82ea4cd999e568e2819dea10bf7214eee3.tar.bz2 | |
Merge branch 'anchorlayout' of git@gitorious.org:+openbossa-developers/qt/openbossa-clone
Conflicts:
src/gui/graphicsview/graphicsview.pri
Diffstat (limited to 'src/gui/graphicsview/graphicsview.pri')
| -rw-r--r-- | src/gui/graphicsview/graphicsview.pri | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/gui/graphicsview/graphicsview.pri b/src/gui/graphicsview/graphicsview.pri index 9d232e4..547d7ce 100644 --- a/src/gui/graphicsview/graphicsview.pri +++ b/src/gui/graphicsview/graphicsview.pri @@ -22,7 +22,12 @@ HEADERS += graphicsview/qgraphicsgridlayout.h \ graphicsview/qgraphicsview_p.h \ graphicsview/qgraphicswidget.h \ graphicsview/qgraphicswidget_p.h \ - graphicsview/qgridlayoutengine_p.h + graphicsview/qgridlayoutengine_p.h \ + graphicsview/qgraph_p.h \ + graphicsview/qsimplex_p.h \ + graphicsview/qgraphicsanchorlayout_p.h \ + graphicsview/qgraphicsanchorlayout.h + SOURCES += graphicsview/qgraphicsgridlayout.cpp \ graphicsview/qgraphicsitem.cpp \ graphicsview/qgraphicsitemanimation.cpp \ @@ -41,4 +46,7 @@ SOURCES += graphicsview/qgraphicsgridlayout.cpp \ graphicsview/qgraphicsview.cpp \ graphicsview/qgraphicswidget.cpp \ graphicsview/qgraphicswidget_p.cpp \ - graphicsview/qgridlayoutengine.cpp + graphicsview/qgridlayoutengine.cpp \ + graphicsview/qsimplex_p.cpp \ + graphicsview/qgraphicsanchorlayout_p.cpp \ + graphicsview/qgraphicsanchorlayout.cpp |