summaryrefslogtreecommitdiffstats
path: root/src/declarative/fx/qfxgridview.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'kinetic-declarativeui' of ↵Michael Brasser2009-07-101-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui-gv Conflicts: examples/itemviews/frozencolumn/main.cpp src/declarative/canvas/qsimplecanvas.cpp src/declarative/canvas/qsimplecanvas_p.h src/declarative/canvas/qsimplecanvasitem.h src/declarative/extra/qfxparticles.cpp src/declarative/fx/fx.pri src/declarative/fx/qfxblurfilter.h src/declarative/fx/qfxcontentwrapper.cpp src/declarative/fx/qfxflickable.cpp src/declarative/fx/qfxfocuspanel.h src/declarative/fx/qfxfocusrealm.h src/declarative/fx/qfxhighlightfilter.cpp src/declarative/fx/qfxhighlightfilter.h src/declarative/fx/qfximage.cpp src/declarative/fx/qfxitem.cpp src/declarative/fx/qfxitem.h src/declarative/fx/qfxrect.cpp src/declarative/fx/qfxreflectionfilter.h src/declarative/fx/qfxshadowfilter.cpp src/declarative/fx/qfxshadowfilter.h src/declarative/fx/qfxtext.cpp src/declarative/fx/qfxtext.h src/declarative/fx/qfxtextedit.cpp src/declarative/opengl/glbasicshaders.h src/declarative/test/qfxtestengine.cpp src/declarative/test/qfxtestengine.h src/declarative/test/qfxtestobjects.cpp src/declarative/test/qfxtestobjects.h src/declarative/test/qfxtestview.h src/declarative/util/qfxglobal.h src/declarative/util/qfxview.cpp src/gui/graphicsview/qgraphicsitem_p.h tools/qmlviewer/qmlviewer.cpp
| * Support compile-in-namespace for the declarative module.Michael Brasser2009-06-301-2/+2
| |
* | Merge branch 'kinetic-declarativeui' into kinetic-declarativeui-gvAaron Kennedy2009-06-241-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: src/declarative/canvas/qsimplecanvasitem.cpp src/declarative/canvas/qsimplecanvasitem_p.h src/declarative/fx/qfxwebview.cpp
| * Remove unneeded semicolons.Martin Jones2009-06-121-1/+1
| |
* | Make QSimpleCanvasItem inherit QGraphicsObjectAaron Kennedy2009-06-231-1/+1
|/
* Remove more unneeded semicolons.Martin Jones2009-05-261-15/+15
|
* Remove extraneous semicolons.Martin Jones2009-05-261-1/+1
| | | | Caused massive number of warnings with winscw
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-05-201-1/+1
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Fixed #includesRoberto Raggi2009-05-181-1/+1
| |
* | Make VisualItemModel with packages work properly.Martin Jones2009-05-201-0/+2
|/ | | | | The views can all now deal with items that they have not requested appearing, and will lay them out appropriately.
* setWidth() and setHeight() lost their virtual at some point :-/Martin Jones2009-05-081-3/+1
|
* Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-0/+148