summaryrefslogtreecommitdiffstats
path: root/src/gui/gui.pro
Commit message (Collapse)AuthorAgeFilesLines
* Integrate the OpenVG graphics system into Qt 4.6Rhys Weatherley2009-06-221-0/+2
| | | | | This change also moves the EGL support classes from QtOpenGL to QtGui so they can be shared between OpenGL and OpenVG.
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Thierry Bastian2009-05-221-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | kinetic-animations Conflicts: src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/tools.pri src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicswidget.h src/gui/gui.pro
| * Long live Qt!Lars Knoll2009-03-231-0/+45
|
* Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-171-0/+46