Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-12-20 | 2 | -1/+5 |
|\ | |||||
| * | Update docs on importing javascript files | Bea Lam | 2010-12-20 | 2 | -1/+5 |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-20 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Doc: typo fixed in doc/src/declarative/extending.qdoc | Joerg Bornemann | 2010-12-16 | 1 | -1/+1 |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-13 | 10 | -23/+387 |
|\ \ | |/ | |||||
| * | Improvements to anchoring docs | Bea Lam | 2010-12-09 | 1 | -17/+49 |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-12-09 | 8 | -4/+336 |
| |\ | |||||
| | * | Document support for QVariantList and QVariantMap type conversion | Bea Lam | 2010-12-06 | 4 | -1/+156 |
| | * | Some doc clarification for components and javascript integration | Bea Lam | 2010-12-06 | 1 | -3/+2 |
| | * | Qt.include() docs weren't being picked up by qdoc | Bea Lam | 2010-12-06 | 4 | -0/+178 |
| * | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-12-03 | 28 | -316/+1287 |
| |\ \ | | |/ | |||||
| * | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-12-02 | 1 | -0/+9 |
| |\ \ | |||||
| * \ \ | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-12-01 | 2 | -6/+6 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-30 | 5 | -2/+108 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-29 | 1 | -4/+9 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix documentation for QML extended types | Caio Marcelo de Oliveira Filho | 2010-11-29 | 1 | -2/+2 |
* | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-06 | 36 | -328/+1420 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Add 'Writing New Components' docs, and document the connect() function. | Bea Lam | 2010-12-03 | 28 | -316/+1287 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Cleaned up sis_targets.prf | Miikka Heikkinen | 2010-12-02 | 1 | -0/+9 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-12-01 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fix two minor doc errors | Andy Shaw | 2010-12-01 | 1 | -1/+1 |
| | | |_|/ | | |/| | | |||||
| * | | | | Fix license header. | Jason McDonald | 2010-12-01 | 1 | -5/+5 |
| |/ / / | |||||
| * | | | Document which header to include for qmlRegister functions. | Martin Jones | 2010-11-30 | 3 | -1/+19 |
| * | | | Fix id documentation | Bea Lam | 2010-11-30 | 1 | -1/+1 |
| * | | | Link to List Properties docs from QML Intro page | Bea Lam | 2010-11-30 | 1 | -0/+4 |
| * | | | Add license to example code | Bea Lam | 2010-11-29 | 1 | -0/+39 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-11-29 | 1 | -0/+45 |
| |\ \ \ | | |_|/ | |/| | | |||||
| | * | | Move KeyNavigation example to snippets, plus some doc rewording | Bea Lam | 2010-11-29 | 1 | -0/+45 |
| | |/ | |||||
| * | | Add NetworkServices capability automatically for network apps | Miikka Heikkinen | 2010-11-29 | 1 | -4/+9 |
| |/ | |||||
| * | Only patch package content that is necessary for self-signing | Miikka Heikkinen | 2010-11-25 | 1 | -0/+1 |
* | | Fix license header. | Jason McDonald | 2010-12-06 | 1 | -5/+5 |
* | | QScroller merge, part 1 | Robert Griebl | 2010-12-02 | 1 | -0/+109 |
* | | Fix license headers | Jason McDonald | 2010-12-01 | 2 | -10/+10 |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-25 | 15 | -30/+552 |
|\ \ | |/ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-24 | 1 | -0/+8 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-24 | 1 | -0/+8 |
| | |\ | |||||
| | | * | Merge remote branch 'qt/4.7' into 4.7 | Jason McDonald | 2010-11-23 | 12 | -29/+528 |
| | | |\ | |||||
| | | * \ | Merge remote branch 'qt/4.7' into 4.7 | Jason McDonald | 2010-11-18 | 7 | -12/+167 |
| | | |\ \ | |||||
| | | * | | | Localize .loc and .pkg content based on TRANSLATIONS | Miikka Heikkinen | 2010-11-12 | 1 | -0/+8 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-11-24 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Fix incorrect example for Qt.rgba() | Bea Lam | 2010-11-24 | 1 | -1/+1 |
| | | |_|/ | | |/| | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-22 | 2 | -5/+19 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-22 | 2 | -5/+19 |
| | |\ \ \ | |||||
| | | * | | | Doc: Q_PROPERTY, implements the setter/getter in the example | Olivier Goffart | 2010-11-22 | 2 | -5/+19 |
| | | | |/ | | | |/| | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration | Qt Continuous Integration System | 2010-11-22 | 11 | -23/+522 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-11-19 | 3 | -11/+11 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-11-17 | 3 | -11/+11 |
| | | |\ \ \ | | | | |/ / | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-11-17 | 61 | -382/+2667 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-11-15 | 3 | -0/+140 |
| | | |\ \ \ | |||||
| | | * | | | | Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt Quick | Morten Engvoldsen | 2010-11-15 | 3 | -2/+501 |