Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ../qt-qml-staging | Michael Brasser | 2011-08-11 | 89 | -556/+3722 |
|\ | |||||
| * | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | Aaron Kennedy | 2011-08-04 | 89 | -556/+3718 |
| |\ | |||||
| | * | Added -datatags option to QTestLib | jasplin | 2011-07-26 | 1 | -0/+3 |
| | * | Doc: Added a link to the How to Learn Qt document. | David Boddie | 2011-07-19 | 1 | -1/+2 |
| | * | Doc: Fixed shader program snippet. | David Boddie | 2011-07-19 | 1 | -2/+2 |
| | * | Doc: Fixed page step sizes in a snippet for QAbstractScrollArea. | David Boddie | 2011-07-18 | 1 | -2/+2 |
| | * | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-07-14 | 2 | -16/+0 |
| | |\ | |||||
| | | * | Remove broken link to Symbian.org documentation. | Casper van Donderen | 2011-07-12 | 2 | -16/+0 |
| | * | | Doc: fix typo | Joerg Bornemann | 2011-07-11 | 1 | -1/+1 |
| | * | | Merge remote branch 'upstream/4.8' | Jerome Pasion | 2011-07-08 | 3 | -5/+77 |
| | |\ \ | |||||
| | | * \ | Merge remote branch 'origin/4.7' into qt-4.8-from-4.7 | Jani Hautakangas | 2011-07-04 | 2 | -5/+42 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Update QtOpenGL section in Symbian platform notes. | Jani Hautakangas | 2011-07-01 | 2 | -5/+42 |
| | | * | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-06-29 | 78 | -508/+3258 |
| | | |\ \ | |||||
| | | * | | | Provide the resetInternalData slot to cleanly reset data in proxy subclasses. | Stephen Kelly | 2011-06-27 | 1 | -0/+35 |
| | * | | | | Committing the qt-webpages.qdoc file with the online links | Jerome Pasion | 2011-07-04 | 1 | -22/+22 |
| | * | | | | Preparing documentation package for 4.8-beta | Jerome Pasion | 2011-07-04 | 4 | -25/+142 |
| | * | | | | Doc: Removed whitespace. | David Boddie | 2011-07-01 | 1 | -1/+0 |
| | * | | | | Doc: Added a simple introduction to Qt and fixed links. | David Boddie | 2011-07-01 | 5 | -5/+209 |
| | * | | | | Doc: Removed non-ASCII characters from the documentation. | David Boddie | 2011-07-01 | 1 | -6/+6 |
| | | |/ / | | |/| | | |||||
| | * | | | Re-apply licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-06-27 | 7 | -77/+77 |
| | * | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-06-24 | 5 | -11/+35 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Laszlo Agocs | 2011-06-20 | 2 | -24/+7 |
| | | |\ \ | |||||
| | | * | | | Qmlshadersplugin examples added. | Marko Niemelä | 2011-06-13 | 3 | -11/+22 |
| | | * | | | Qmlshadersplugin API documentation enhancements. | Marko Niemelä | 2011-06-13 | 2 | -0/+13 |
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-06-22 | 1 | -18/+23 |
| | |\ \ \ \ | |||||
| | | * | | | | docu update for QNX 6.5 | Ritt Konstantin | 2011-06-21 | 1 | -18/+23 |
| | | | |_|/ | | | |/| | | |||||
| | * | | | | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt | David Boddie | 2011-06-17 | 5 | -18/+54 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-06-08 | 2 | -24/+7 |
| | | |\ \ \ | |||||
| | | | * \ \ | Merge remote branch 'upstream/4.8' into qt-4.8-from-4.7 | Toby Tomkins | 2011-06-08 | 1 | -0/+11 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-31 | 2 | -24/+7 |
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| | | |||||
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-05-27 | 2 | -24/+7 |
| | | | | |\ \ \ | | | | | | |_|/ | | | | | |/| | | |||||
| | | | | | * | | Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA... | Joona Petrell | 2011-05-27 | 2 | -24/+7 |
| | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-06-08 | 2 | -0/+38 |
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | |||||
| | | | * | | | | Merge remote branch 'qt/4.8' into fire-master | Paul Olav Tvete | 2011-06-06 | 579 | -6013/+6022 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | * | | | | Add the new 'glhypnotizer' demo. | Jason Barron | 2011-06-03 | 2 | -0/+38 |
| | | * | | | | | Document the Symbian main window size issue at application start. | Miikka Heikkinen | 2011-05-25 | 1 | -0/+11 |
| | | | |/ / / | | | |/| | | | |||||
| | * | | | | | Doc: Added missing license headers for documentation and examples. | David Boddie | 2011-06-08 | 5 | -55/+55 |
| | * | | | | | Merge branch '4.8' | David Boddie | 2011-06-08 | 1 | -0/+7 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Doc: Added a snippet to show how to test the Qt version. | David Boddie | 2011-06-03 | 1 | -0/+7 |
| | * | | | | | | Doc: Fixed links. | David Boddie | 2011-06-07 | 2 | -2/+2 |
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-team | David Boddie | 2011-05-27 | 3 | -76/+401 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||||
| | | * | | | | | converted to unix txt file | Vladimir Minenko | 2011-05-26 | 1 | -218/+218 |
| | | * | | | | | try to resolve CRLR problems | Vladimir Minenko | 2011-05-26 | 1 | -3/+2 |
| | | * | | | | | "TAB character in non-leading whitespace" fixed | Vladimir Minenko | 2011-05-26 | 1 | -45/+43 |
| | | * | | | | | * fixed trailing- and whitespaces | Vladimir Minenko | 2011-05-26 | 2 | -76/+91 |
| | | * | | | | | Merge remote-tracking branch 'origin/master' | Vladimir Minenko | 2011-05-26 | 609 | -6402/+7975 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | * "How To Learn Qt" is almost complete. Last section is missing | Vladimir Minenko | 2011-05-25 | 3 | -134/+439 |
| | | * | | | | | | table of content | Vladimir Minenko | 2011-05-13 | 1 | -2/+20 |
| | | * | | | | | | Doc: Fixed typo. | David Boddie | 2011-05-02 | 1 | -1/+1 |
| | | * | | | | | | Fixing potential js hole in the js function for the feedback channel. | Morten Engvoldsen | 2011-04-29 | 1 | -1/+1 |