Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| |/ / / |/| | | | |||||
* | | | | Merge remote branch 'origin/4.8' into 4.8-from-4.7 | Rohan McGovern | 2011-05-20 | 6 | -61/+56 |
|\ \ \ \ | |||||
| * \ \ \ | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-19 | 2 | -7/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-05-18 | 1 | -109/+0 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge remote-tracking branch 'origin/4.8' | Olivier Goffart | 2011-05-16 | 1 | -0/+123 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Doc: update platform notes on Mac to reflect WA_MacNoCocoaChildWindow | Richard Moe Gustavsen | 2011-05-11 | 1 | -1/+1 |
| | * | | | | | | QT_USE_QSTRINGBUILDER to fix source compatibility | Olivier Goffart | 2011-05-09 | 1 | -6/+1 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-18 | 1 | -109/+0 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merge remote-tracking branch 'qt/4.8' | Jyri Tahtela | 2011-05-16 | 1 | -0/+123 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 578 | -5906/+5906 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge remote branch 'origin/4.7' into 4.8-from-4.7 | Rohan McGovern | 2011-05-17 | 573 | -5843/+5843 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | |||||
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-05-17 | 573 | -5842/+5842 |
| |\ \ \ \ | |||||
| | * | | | | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 573 | -5842/+5842 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2011-05-13 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | Martin Smith | 2011-05-09 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * | | | | | doc: Fixed a QML snippet reference | Martin Smith | 2011-05-09 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-05-16 | 1 | -109/+0 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Revert all QScroller and QFlickGesture related code. | Robert Griebl | 2011-05-16 | 1 | -109/+0 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-review into master-... | Kai Koehne | 2011-05-12 | 1 | -0/+123 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||||
| * | | | | | Allow 'typeinfo <file>' lines in qmldir. | Christian Kamm | 2011-05-12 | 1 | -0/+123 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ma... | Qt Continuous Integration System | 2011-05-05 | 1 | -0/+49 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge remote-tracking branch 'qt/4.8' | Sami Lempinen | 2011-04-28 | 5 | -24/+174 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Implement support for enable_backup CONFIG value. | Miikka Heikkinen | 2011-04-26 | 1 | -0/+49 |
* | | | | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-03 | 3 | -3/+7 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7 | David Boddie | 2011-05-02 | 3 | -3/+7 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Fixing potential js hole in the js function for the feedback channel. | Morten Engvoldsen | 2011-04-29 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | |||||
| | * | | | | Ensured that incomplete downloads are removed. | David Boddie | 2011-04-07 | 1 | -1/+3 |
| | * | | | | Aim to fix Windows builds. | David Boddie | 2011-04-05 | 1 | -1/+3 |
* | | | | | | Merge branch '4.8-upstream' | Thierry Bastian | 2011-04-28 | 1 | -24/+8 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-04-27 | 1 | -24/+8 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-04-26 | 1 | -24/+8 |
| | |\ \ \ \ | |||||
| | | * | | | | Update Symbian platform notes documentation | Jani Hautakangas | 2011-04-26 | 1 | -24/+8 |
* | | | | | | | Removing the "resetInternalData" slot in QAbstractProxyModel | Gabriel de Dietrich | 2011-04-26 | 1 | -35/+0 |
* | | | | | | | Merge branch 'master-upstream' | Thierry Bastian | 2011-04-19 | 454 | -8856/+18302 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast... | Qt Continuous Integration System | 2011-04-18 | 2 | -0/+132 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Merge earth-team into origin/master' | Olivier Goffart | 2011-04-12 | 86 | -361/+4567 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-master | axis | 2011-04-07 | 374 | -8604/+13678 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge remote branch 'origin/master' into 4.8-earth | Denis Dzyubenko | 2011-03-28 | 12 | -18/+459 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | network API: add support for HTTP multipart messages | Peter Hartmann | 2011-03-22 | 2 | -0/+132 |
| * | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-04-12 | 2 | -0/+34 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | | | |||||
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-04-12 | 2 | -0/+34 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Allow enum values to be used as signal parameters | Bea Lam | 2011-04-12 | 2 | -0/+34 |