Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-03-02 | 1 | -4/+4 |
|\ | |||||
| * | make the $$quote() function less prominent | Oswald Buddenhagen | 2011-03-01 | 1 | -4/+4 |
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 1 | -5/+2 |
|\ \ | |/ |/| | |||||
| * | fix/improve docs for new QtQuick 1.1 attributes | Bea Lam | 2011-02-28 | 1 | -5/+2 |
* | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-02-17 | 1 | -3/+4 |
|\ \ | |/ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-02-17 | 1 | -3/+4 |
| |\ | |||||
| | * | Remove sqlite3.sis from qt.sis. | Miikka Heikkinen | 2011-02-17 | 1 | -3/+4 |
* | | | Merge branch earth-team/master into earth-staging | João Abecasis | 2011-02-16 | 1 | -0/+12 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-01-31 | 988 | -998/+1006 |
| |\ \ \ | |||||
| * | | | | Add packagesExist() function to qmake. | Robin Burchell | 2011-01-17 | 1 | -0/+12 |
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 19 | -311/+785 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Doc: Fixed warnings and other problems found while fixing markup. | David Boddie | 2011-02-07 | 2 | -2/+2 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-02-04 | 3 | -9/+62 |
| |\ \ \ \ | |||||
| * | | | | | Replace all occurances of "Qt 4.7" with "QtQuick 1.0" | Sergio Ahumada | 2011-01-28 | 1 | -1/+1 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-01-26 | 1 | -3/+11 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-01-26 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Doc: fixing bugs and typos based on feedback | Morten Engvoldsen | 2011-01-25 | 1 | -1/+1 |
| * | | | | | | Doc: Fixed the syntax of QML code snippets. | David Boddie | 2011-01-26 | 2 | -32/+102 |
| * | | | | | | Doc: Fixed the syntax of QML code snippets. | David Boddie | 2011-01-24 | 2 | -0/+142 |
| * | | | | | | Merge branch '4.7' into qdoc-simplified | David Boddie | 2011-01-21 | 993 | -1195/+1540 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Doc: Fixed qdoc warnings caused by invalid/incomplete QML snippets. | David Boddie | 2011-01-17 | 6 | -194/+346 |
| | |/ / / / / | |||||
| | * | | | | | Merge branch '4.7' of ../qt into 4.7 | David Boddie | 2011-01-13 | 987 | -1001/+1043 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Doc: Added a missing snippet. | David Boddie | 2011-01-13 | 1 | -0/+51 |
| | * | | | | | | Doc: Sync with upstream. | David Boddie | 2010-12-22 | 1 | -1/+1 |
| | * | | | | | | Doc: Fixed QML syntax in quoted code snippets. | David Boddie | 2010-12-21 | 1 | -0/+61 |
| | * | | | | | | Added BSD license to snippet code. | Jerome Pasion | 2010-12-20 | 1 | -0/+39 |
| * | | | | | | | Doc: Fixed the syntax of QML code snippets. | David Boddie | 2011-01-21 | 2 | -71/+69 |
| |/ / / / / / | |||||
| * | | | | | | Merge branch '4.7' into qdoc-simplified | David Boddie | 2010-12-15 | 6 | -0/+276 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-14 | 32 | -1/+1670 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'qdoc-simplified' into mimir-simplified | David Boddie | 2010-12-07 | 59 | -221/+1701 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | doc: Removed an illegal char and some empty \row commands. | Martin Smith | 2010-10-27 | 1 | -1/+1 |
| * | | | | | | | | | doc: Removed some illegal characters. | Martin Smith | 2010-10-27 | 1 | -8/+8 |
| * | | | | | | | | | doc: Removed an illegal character. | Martin Smith | 2010-10-27 | 1 | -1/+1 |
* | | | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-04 | 3 | -9/+62 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | Move Qt.application docs into Qt global object page | Bea Lam | 2011-02-02 | 1 | -7/+7 |
| * | | | | | | | | Add initial size to ListView in FolderListModel example | Bea Lam | 2011-02-02 | 1 | -4/+8 |
| * | | | | | | | | Update Docs, Examples and Demos for new CreateObject overloadable | Christopher Ham | 2011-01-28 | 1 | -5/+1 |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11 | Martin Jones | 2011-01-19 | 988 | -997/+1005 |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | |||||
| * | | | | | | | | Introduce Qt.application.active property | Joona Petrell | 2011-01-07 | 1 | -0/+53 |
* | | | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 988 | -998/+1006 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | Consistent Docs | Alan Alpert | 2011-01-13 | 1 | -3/+11 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 988 | -994/+994 |
| |/ / / / / | |||||
* | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-12-23 | 4 | -8/+50 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Improve docs on attached properties on view delegates. | Martin Jones | 2010-12-23 | 4 | -8/+50 |
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-23 | 13 | -1/+681 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Doc: Added a missing license header. | David Boddie | 2010-12-21 | 1 | -0/+39 |
| | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-13 | 6 | -0/+276 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Fixed the QML Focus document. Fixed snippets, images, and formatting. | Jerome Pasion | 2010-12-06 | 11 | -0/+593 |
| * | | | | Added QML coding convention for "private" properties. | Jerome Pasion | 2010-12-06 | 1 | -0/+49 |
| * | | | | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-03 | 18 | -0/+943 |
| |\ \ \ \ |