summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qmlgraphicsevents.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/master'Thiago Macieira2010-02-201-3/+0
|\ | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| * | Move type initialization from global static initializers to QmlEngine ↵Warwick Allison2010-02-141-3/+0
| | | | | | | | | | | | | | | | | | construction. Task-number: QT-2798
* | | doc: Added "\since 4.7" to a bunch of declarative stuff.Martin Smith2010-02-191-0/+1
| |/ |/|
* | Fix copyright year.Jason McDonald2010-02-161-1/+1
|/ | | | Reviewed-by: Trust Me
* Rename fx -> graphicsitemsAaron Kennedy2009-10-301-0/+195