Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-18 | 1 | -22/+24 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 | Jason McDonald | 2010-02-16 | 1 | -4/+6 |
| |\ | |||||
| | * | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-16 | 1 | -4/+6 |
| | | | |||||
| * | | Fix broken license headers. | Jason McDonald | 2010-02-16 | 1 | -18/+18 |
| |/ | | | | | | | Reviewed-by: Trust Me | ||||
* | | QmlView API review. See QmlChanges.txt for details. | Martin Jones | 2010-02-18 | 1 | -0/+9 |
|/ | |||||
* | Improve documentation | Alan Alpert | 2010-01-05 | 1 | -13/+27 |
| | | | | | 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 code | Alan Alpert | 2009-12-30 | 1 | -0/+90 |