Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 1 | -0/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/example-slideswitch.qdoc doc/src/development/qmake-manual.qdoc doc/src/snippets/code/doc_src_qmake-manual.pro doc/src/snippets/code/doc_src_qtscript.qdoc src/corelib/animation/qabstractanimation.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def tests/auto/qdir/qdir.pro tests/auto/qsslsocket/tst_qsslsocket.cpp tools/qdoc3/doc/qdoc-manual.qdocconf | ||||
| * | Doc: Fixed QML snippet highlighting by creating a complete code snippet. | David Boddie | 2011-03-03 | 1 | -0/+2 |
| | | |||||
* | | Update copyright year to 2011. | Rohan McGovern | 2011-03-10 | 1 | -1/+1 |
|/ | | | | | Reviewed-by: Trust Me (cherry picked from commit 774a3536b00c4d6e4c4c10b708e31b4373a338e3) | ||||
* | Doc: Added a missing snippet. | David Boddie | 2011-01-13 | 1 | -0/+51 |
Task-number: QTBUG-16619 |