summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qmlview.h
Commit message (Collapse)AuthorAgeFilesLines
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-114/+0
| | | | QDeclarativeXXX.
* Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-231-1/+2
|\
| * Remove QmlView::execute(). QmlView::setSource() does it all now.Martin Jones2010-02-231-1/+2
| | | | | | | | Task-number: QT-2538
* | Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-221-2/+2
|\ \ | |/ | | | | | | | | | | Conflicts: src/declarative/qml/qml.pri src/declarative/qml/qmlengine.cpp src/declarative/util/qmlview.h
| * Remove use of unexprted private classes.Martin Jones2010-02-221-2/+2
| |
* | Introduced the internal virtual method QmlView::setRootObject(object).Roberto Raggi2010-02-191-1/+2
|/ | | | Done-with: mae
* 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
| * Fix copyright year.Jason McDonald2010-02-161-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * doc: Fixed some qdoc errors.Martin Smith2010-02-161-1/+1
| |
* | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-181-25/+24
|/
* Qt.quit() added to qml.Tapani Mikola2009-11-301-0/+1
|
* Cleanup.Michael Brasser2009-11-131-2/+0
|
* CleanupAaron Kennedy2009-10-301-1/+0
|
* Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-10-301-16/+16
|\ | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/debugger/qmldebug.cpp src/declarative/fx/qmlgraphicsimagebase_p.h src/declarative/util/qmlanimation.h src/declarative/util/qmlstate.h src/declarative/util/qmltimer.cpp
| * fix headersWarwick Allison2009-10-291-16/+16
| |
* | Rename QFx classes to QmlGraphicsAaron Kennedy2009-10-301-3/+3
|/
* Fix "initial" size for remote content.Warwick Allison2009-10-261-0/+1
|
* Add url() for setUrl().Warwick Allison2009-10-081-0/+1
|
* Renaming: QFxView -> QmlViewYann Bodson2009-09-221-0/+113