summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qmlgraphicsloader.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-488/+0
| | | | QDeclarativeXXX.
* Merge remote branch 'origin/master'Thiago Macieira2010-02-231-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc src/declarative/graphicsitems/qmlgraphicsmousearea.cpp src/multimedia/playback/qmediaplayer.cpp
| * Rename MouseRegion -> MouseAreaMartin Jones2010-02-221-1/+1
| |
* | Merge remote branch 'origin/master'Thiago Macieira2010-02-201-2/+1
|\ \ | |/ | | | | | | 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
| * | Add missing NOTIFY signals to various QML item class propertiesJoona Petrell2010-02-171-0/+1
| | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | Move type initialization from global static initializers to QmlEngine ↵Warwick Allison2010-02-141-2/+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
* Fix warningsAaron Kennedy2010-02-121-3/+0
|
* Decouple Loader from QmlGraphicsItemJoona Petrell2010-02-121-33/+108
| | | | | Task-number: QT-2823 Reviewed-by: Aaron Kennedy
* Test SizeItemToLoader to SizeLoaderToItem resizeMode change.Martin Jones2010-02-041-0/+6
| | | | Task-number: QT-2376
* Fix Loader crash when Loader.item causes a new item to be loadedMartin Jones2010-02-031-2/+8
| | | | Task-number: QT-2338
* Fix leaks.Michael Brasser2009-12-071-0/+2
|
* fix includesOswald Buddenhagen2009-12-031-3/+4
| | | | | | | | | | | | - 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).
* Doc.Michael Brasser2009-11-181-0/+2
|
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-051-1/+1
|\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/graphicsitems/qmlgraphicsloader.cpp
| * 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
* | Loader cleanup and testing.Martin Jones2009-11-051-40/+49
|/
* Doc.Michael Brasser2009-11-031-1/+1
|
* Rename fx -> graphicsitemsAaron Kennedy2009-10-301-0/+390