Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/4.6' into kinetic-declarativeui | Lars Knoll | 2009-09-18 | 4 | -12/+57 |
|\ | | | | | | | | | Conflicts: configure.exe | ||||
| * | Changed ingroup to correct group. | Peter Yard | 2009-09-18 | 1 | -1/+2 |
| | | |||||
| * | Corrected name of gestures png image name. | Peter Yard | 2009-09-18 | 1 | -1/+1 |
| | | |||||
| * | Fix license headers. | Jason McDonald | 2009-09-17 | 1 | -0/+40 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Fix qdoc warning about missing file | Sarah Smith | 2009-09-17 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: TrustMe | ||||
| * | Doc: Added notes about using dock widgets and fixed some references. | David Boddie | 2009-09-16 | 1 | -7/+13 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | doc: Fixed some qdoc errors. | Martin Smith | 2009-09-16 | 1 | -2/+0 |
| | | |||||
* | | Some documentation link updates | Thorbjørn Lindeijer | 2009-09-16 | 1 | -2/+1 |
| | | |||||
* | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-09-15 | 14 | -129/+223 |
|\ \ | |/ | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe | ||||
| * | Doc: Added missing files for the Designer manual. | David Boddie | 2009-09-15 | 5 | -0/+0 |
| | | | | | | | | | | Reviewed-by: Trust Me Overcomplicated-workflow-by: Git | ||||
| * | Doc: Cleaned up the Designer main window and Embedded Linux pages. | David Boddie | 2009-09-15 | 9 | -129/+223 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 2 | -20/+130 |
|\ \ | |/ | |||||
| * | doc: Fixed some qdoc errors. | Martin Smith | 2009-09-15 | 1 | -20/+21 |
| | | |||||
| * | Doc: Added some snippets to the multimedia audio docs. | Geir Vattekar | 2009-09-15 | 1 | -0/+109 |
| | | |||||
* | | Merge commit 'qt-mainline/4.6' into kinetic-declarativeui | Andreas Aardal Hanssen | 2009-09-15 | 1222 | -4989/+5895 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | ||||
| * | qdoc: Shift snippets in QGLShaderProgram out into doc/src/snippets | Rhys Weatherley | 2009-09-15 | 1 | -0/+92 |
| | | |||||
| * | Doc: Ongoing improvements. | David Boddie | 2009-09-14 | 2 | -73/+84 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Added example to docs for QPainter::beginNativePainting(). | Samuel Rødal | 2009-09-11 | 1 | -0/+17 |
| | | | | | | | | | | | | Hopefully this helps clarify the use of beginNativePainting(). Reviewed-by: Trond | ||||
| * | Doc: QHeaderView::section:checked was left out of stylesheet docs. | Geir Vattekar | 2009-09-11 | 2 | -1/+7 |
| | | | | | | | | | | Task-number: 254741 Reviewed-by: Trust Me | ||||
| * | Doc: Updated the Qt for Embedded Platforms page. | David Boddie | 2009-09-10 | 7 | -21/+723 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Doc: Fixed snippet bug in stylesheet docs | Geir Vattekar | 2009-09-10 | 2 | -3/+3 |
| | | | | | | | | | | Task-number: 241222 Reviewed-by: Trust Me | ||||
| * | Update installation instructions for building for Symbian | Shane Kearns | 2009-09-10 | 2 | -1/+11 |
| | | | | | | | | | | | | | | | | Add MinGW to list of tools people need to build the tools. Update RVCT version from 616->686 Include instructions for building with raptor Reviewed-by: Jason Barron | ||||
| * | Doc: First part of my review of the gestures overview. | David Boddie | 2009-09-09 | 1 | -24/+84 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
| * | Doc: Updated the license information for Phonon. | David Boddie | 2009-09-09 | 1 | -2/+4 |
| | | | | | | | | | | Reviewed-by: Trust Me Really-reviewed-by: Legal | ||||
| * | Update license headers again. | Jason McDonald | 2009-09-09 | 1216 | -4864/+4870 |
| | | | | | | | | Reviewed-by: Trust Me | ||||
* | | More ListView API changes. | Martin Jones | 2009-09-14 | 1 | -5/+5 |
| | | | | | | | | | | ListView: wrap -> keyNavigationWraps ListView: autoHighlight -> highlightFollowsCurrentItem | ||||
* | | Fixed references to QFxPainted, which got replaced by QFxPaintedItem | Thorbjørn Lindeijer | 2009-09-10 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | See commit 415708f85341448c6f30bbca6e31e48dbfde72a5, and later renaming of QFxImageItem to QFxPaintedItem in commit d1bb572b9fb5b0286df992c8ae560d91c9dc3388. Also added a table of contents to the QML for C++ Programmers page. | ||||
* | | typo | Yann Bodson | 2009-09-10 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-09 | 6 | -12/+54 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-09-09 | 4 | -10/+53 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-09-08 | 4 | -10/+53 |
| | |\ \ | | | |/ | | | | | | | | | kinetic-declarativeui | ||||
| | | * | Doc: Fixed bug in style sheet syntax documentation. | Geir Vattekar | 2009-09-08 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | Task-number: 234366 Reviewed-by: Trust Me | ||||
| | | * | Doc: fixing a QFileInfo snippet type | João Abecasis | 2009-09-08 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | Task-number: 258371 | ||||
| | | * | Add license header. | Jason McDonald | 2009-09-08 | 1 | -0/+41 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | | * | doc: Fixed several qdoc errors. | Martin Smith | 2009-09-08 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | That's the last of them... for now. | ||||
| * | | | Move ComponentInstance functionality into Loader | Martin Jones | 2009-09-09 | 2 | -2/+1 |
| |/ / | |||||
* | | | Add EaseFollow element | Aaron Kennedy | 2009-09-09 | 1 | -0/+1 |
|/ / | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Aaron Kennedy | 2009-09-08 | 25 | -16/+553 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Martin Jones | 2009-09-08 | 24 | -15/+552 |
| |\ \ | | |/ | | | | | | | kinetic-declarativeui | ||||
| | * | Doc: Minor adjustments to the rogue example docs. | Geir Vattekar | 2009-09-07 | 1 | -8/+8 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | Doc: Added a note that a state machine requires a running event loop. | David Boddie | 2009-09-07 | 1 | -0/+15 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6 | Miikka Heikkinen | 2009-09-07 | 9 | -0/+207 |
| | |\ | |||||
| | | * | Doc: Some animation examples had no docs in qtdemo. | Geir Vattekar | 2009-09-07 | 9 | -0/+207 |
| | | | | | | | | | | | | | | | | | | | | Task-number: 260779 Reviewed-by: Morten Engvoldsen | ||||
| | * | | Re-added Symbian specific plugins documentation that had gotten lost. | Miikka Heikkinen | 2009-09-07 | 1 | -0/+14 |
| | |/ | | | | | | | | | | | | | | | | | | | Documentation structure changes had caused Symbian plugin documentation to be lost, so revised and re-added it to plugins-howto.qdoc. Reviewed-by: Janne Anttila | ||||
| | * | Doc: Added info on Q_FLAGS() by providing an example with more context. | David Boddie | 2009-09-04 | 1 | -3/+19 |
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me As-seen-on: qt-interest | ||||
| | * | Added Symbian to our list of Tier1 platforms | Espen Riskedal | 2009-09-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | At the moment we only support S60 3.1, 3.2 and 5.0. Once Symbian Platforms actually gets publicly released we'll add those too. Reviewed-by: Volker Hilsheimer Reviewed-by: Jason Barron | ||||
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | David Boddie | 2009-09-04 | 37 | -87/+548 |
| | |\ | |||||
| | | * | Merge branch '4.5' into 4.6 | Thiago Macieira | 2009-09-04 | 4 | -0/+160 |
| | | |\ | |||||
| | | | * | Add license headers to python code | Jason McDonald | 2009-09-04 | 4 | -0/+160 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | | * | | Update license headers | Jason McDonald | 2009-09-04 | 5 | -3/+126 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me |