Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-10 | 2 | -10/+10 |
|\ | |||||
| * | Update source package names in documentation. | Jason McDonald | 2009-12-08 | 2 | -10/+10 |
| | | | | | | | | | | Task-number: QTBUG-6574 Reviewed-by: Trust Me | ||||
* | | Add simple translation example to docs. | Michael Brasser | 2009-12-09 | 1 | -0/+29 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-12-09 | 2 | -8/+9 |
|\ \ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Link to QML Debugging from index page | Bea Lam | 2009-12-09 | 2 | -8/+9 |
| | | | |||||
* | | | Increase prominence of "QML", since many people know the technology by that ↵ | Warwick Allison | 2009-12-09 | 2 | -2/+2 |
|/ / | | | | | | | name. | ||||
* | | Add info about qmldebugger and its creator plugin, with screenshot. | Bea Lam | 2009-12-08 | 2 | -2/+51 |
| | | |||||
* | | Add barebones debugging documentation. | Michael Brasser | 2009-12-08 | 2 | -1/+72 |
| | | |||||
* | | Add barebones i18n documentation. | Michael Brasser | 2009-12-08 | 3 | -0/+68 |
| | | |||||
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 7 | -24/+37 |
|\ \ | |/ | | | | | | | Conflicts: src/tools/moc/generator.cpp | ||||
| * | Merge branch '4.5' into 4.6-staging | Thiago Macieira | 2009-12-02 | 1 | -4/+2 |
| |\ | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/known-issues.qdoc src/script/qscriptextqobject.cpp tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp | ||||
| | * | Update known issues. | Jason McDonald | 2009-11-14 | 1 | -9/+1 |
| | | | | | | | | | | | | | | | | | | | | | Refer to new bug tracker and remove known issue for VS Integration (as it has been replaced by the VS Add-in). Reviewed-by: Trust Me | ||||
| | * | Remove mention of QtSW. | Jason McDonald | 2009-09-29 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | Update license headers again. | Jason McDonald | 2009-09-08 | 1201 | -4804/+4822 |
| | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | Fixes a couple of minor doc points | Andy Shaw | 2009-12-02 | 2 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | Added the perl requirement for building from source on Windows and clarified that the support for OpenGL ES Common Lite 1.0 is being dropped and not for OpenGL ES Common Lite as a whole. Reviewed-by: Martin Smith | ||||
| * | | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-12-02 | 3 | -3/+14 |
| |\ \ | |||||
| | * \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | axis | 2009-12-02 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | 4.6-staging2 | ||||
| | | * | | Minor doc update for known-issues wiki link. | Janne Anttila | 2009-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6211 Reviewed-by: TrustMe | ||||
| | * | | | QVariant documentation: there is no function QVariant::isEmpty() | Olivier Goffart | 2009-12-01 | 1 | -1/+0 |
| | |/ / | |||||
| | * | | Doc: Fixed up a known issue. | David Boddie | 2009-11-30 | 1 | -8/+10 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | Add some notes about known issues for win32-icc | Jan-Arve Sæther | 2009-11-30 | 2 | -1/+11 |
| | | | | |||||
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-29 | 1 | -12/+12 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-27 | 2 | -6/+3 |
| |\ \ \ | |||||
| * | | | | rename .qs files to .js | Kent Hansen | 2009-11-26 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtScript _is_ JavaScript, there's no need to use a custom extension. Most of the other examples were already using .js, but there were two files that still had the .qs extension. Agreed with Simon. Reviewed-by: TrustMe | ||||
| * | | | | Use a pixmap instead of an image in the tablet example | Benjamin Poulain | 2009-11-25 | 1 | -13/+13 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The transformations QImage->QPixmap are killing the performance of the tablet example. This is noticeable because of the number of events sent by the tablet (painting MUST be fast in tabletEvent()). Reviewed-by: David Boddie | ||||
* | | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Bea Lam | 2009-12-01 | 1 | -12/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * \ \ \ \ | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-30 | 1 | -12/+12 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp | ||||
| | * | | | | Merge commit oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-27 | 1 | -12/+12 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | Fixed typo in Symbian installation instructions. | Janne Anttila | 2009-11-27 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6175 Reviewed-by: TrustMe | ||||
* | | | | | | doc fix | Bea Lam | 2009-11-30 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Doc | Aaron Kennedy | 2009-11-30 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Doc | Aaron Kennedy | 2009-11-27 | 1 | -9/+1 |
| | | | | | |||||
* | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-27 | 65 | -263/+2207 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | kinetic-declarativeui | ||||
| * | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | David Boddie | 2009-11-25 | 2 | -6/+3 |
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | |||||
| | * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | axis | 2009-11-24 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | 4.6-staging2 | ||||
| | | * | | Small doc fix. | axis | 2009-11-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | RevBy: Trust me | ||||
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-staging2 | axis | 2009-11-24 | 2 | -0/+11 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge 'upstream/4.6' into oslo-staging-2/4.6 | Olivier Goffart | 2009-11-23 | 7 | -148/+313 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | axis | 2009-11-23 | 1 | -5/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | 4.6-staging2 | ||||
| | | * | | | | Docs: Symbian: correct capabilities wrt. Helix Phonon plugin. | Frans Englich | 2009-11-20 | 1 | -5/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Gareth Stockwell | ||||
| * | | | | | | Doc: Added the required legal notices. | David Boddie | 2009-11-25 | 2 | -1/+534 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | | | | | Doc: Work in progress example placeholders. | David Boddie | 2009-11-25 | 14 | -0/+388 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | David Boddie | 2009-11-24 | 2 | -0/+11 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Added some missing build instructions for abld. | axis | 2009-11-24 | 2 | -0/+11 |
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit will not build unless the mentioned variable is set. RevBy: Aleksandar Sasha Babic | ||||
| * | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | David Boddie | 2009-11-24 | 16 | -219/+319 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge commit 'b7692016f282251002b3e85dfcb5567bd91a12c0' of oslo-staging-1 ↵ | Simon Hausmann | 2009-11-23 | 1 | -3/+12 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | into 4.6 | ||||
| | | * \ \ \ | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6 | Martin Smith | 2009-11-20 | 15 | -205/+291 |
| | | |\ \ \ \ | |||||
| | | * | | | | | doc: Fixed the last qdoc errors (this time). | Martin Smith | 2009-11-20 | 1 | -3/+12 |
| | | | | | | | | |||||
| | * | | | | | | Merge commit '01fec63b7b8f8cae94f92fca1d806fe8c6156299' of oslo-staging-1 ↵ | Simon Hausmann | 2009-11-23 | 7 | -145/+301 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| / / / | | | |_|/ / / | | |/| | | | | into 4.6 | ||||
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-20 | 15 | -205/+291 |
| | | |\ \ \ \ | | | | |/ / / | | | |/| | | |