Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵ | Warwick Allison | 2010-02-24 | 1 | -114/+0 |
| | | | | QDeclarativeXXX. | ||||
* | Merge remote branch 'origin/master' into qtruntime | Roberto Raggi | 2010-02-23 | 1 | -1/+2 |
|\ | |||||
| * | Remove QmlView::execute(). QmlView::setSource() does it all now. | Martin Jones | 2010-02-23 | 1 | -1/+2 |
| | | | | | | | | Task-number: QT-2538 | ||||
* | | Merge remote branch 'origin/master' into qtruntime | Roberto Raggi | 2010-02-22 | 1 | -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 Jones | 2010-02-22 | 1 | -2/+2 |
| | | |||||
* | | Introduced the internal virtual method QmlView::setRootObject(object). | Roberto Raggi | 2010-02-19 | 1 | -1/+2 |
|/ | | | | Done-with: mae | ||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-18 | 1 | -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 McDonald | 2010-02-16 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 1 | -1/+1 |
| | | |||||
* | | QmlView API review. See QmlChanges.txt for details. | Martin Jones | 2010-02-18 | 1 | -25/+24 |
|/ | |||||
* | Qt.quit() added to qml. | Tapani Mikola | 2009-11-30 | 1 | -0/+1 |
| | |||||
* | Cleanup. | Michael Brasser | 2009-11-13 | 1 | -2/+0 |
| | |||||
* | Cleanup | Aaron Kennedy | 2009-10-30 | 1 | -1/+0 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-10-30 | 1 | -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 headers | Warwick Allison | 2009-10-29 | 1 | -16/+16 |
| | | |||||
* | | Rename QFx classes to QmlGraphics | Aaron Kennedy | 2009-10-30 | 1 | -3/+3 |
|/ | |||||
* | Fix "initial" size for remote content. | Warwick Allison | 2009-10-26 | 1 | -0/+1 |
| | |||||
* | Add url() for setUrl(). | Warwick Allison | 2009-10-08 | 1 | -0/+1 |
| | |||||
* | Renaming: QFxView -> QmlView | Yann Bodson | 2009-09-22 | 1 | -0/+113 |