summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qmlgraphicsgraphicsobjectcontainer.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
* Improve documentationAlan Alpert2010-01-051-3/+32
| | | | | Extend documentation on dynamically created objects and on integrating with existing applications. And make those pages more discoverable.
* Add documentation for integrating with existing Qt UI codeAlan Alpert2009-12-301-0/+10
|
* fix includesOswald Buddenhagen2009-12-031-3/+5
| | | | | | | | | | | | - include headers from own directory with "" - include headers from own project without private/ - sort includes from most specific to most generic - make headers self-contained - some whitespace unification no attempt was made at making the qt includes consistent regarding the use of module names and forwarding headers. no attempt was made at sorting includes.
* Undo most of 913dd563064e8047fe738fc9c79135adfb928977Warwick Allison2009-12-021-2/+2
| | | | It seems we're going to have to so a syncqt/configure in Qt modules.
* Remove include styles that rely on configure.Warwick Allison2009-12-011-1/+1
| | | | May help modularization (syncqt and configure are Qt-specific).
* Remove "to" limit on minor version.Warwick Allison2009-11-051-1/+1
| | | | | | QML_DEFINE_TYPE etc. now define just the initial support version, with support in all future versions being thus implied. QTBUG-5421
* Rename fx -> graphicsitemsAaron Kennedy2009-10-301-0/+230