Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-02-04 | 2 | -0/+19 |
|\ | |||||
| * | Add Context2D QtScript benchmark | Kent Hansen | 2011-02-04 | 2 | -0/+19 |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-01 | 1 | -0/+1 |
|\ \ | |/ |/| | |||||
| * | Fix: define hotSpot for Gestures on Mac | Zeno Albisser | 2011-01-26 | 1 | -0/+1 |
* | | Fixed a stupid typo | Robert Griebl | 2011-01-26 | 1 | -1/+1 |
* | | Various small fixes for the QScroller examples | Robert Griebl | 2011-01-24 | 11 | -31/+28 |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 1441 | -1448/+1450 |
|\ \ | |/ | |||||
| * | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 1440 | -1448/+1448 |
| * | Examples: Fix compilation with namespace. | Christian Kandeler | 2011-01-07 | 2 | -4/+4 |
| * | fix include path | Mark Brand | 2011-01-06 | 1 | -0/+2 |
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-23 | 2 | -4/+4 |
|\ \ | |/ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration | Qt Continuous Integration System | 2010-12-21 | 2 | -4/+4 |
| |\ | |||||
| | * | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-12-03 | 2 | -2/+9 |
| | |\ | |||||
| | * | | Doc:Fix paths in styleplugin/echoplugin .pro files | Geir Vattekar | 2010-11-26 | 2 | -4/+4 |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-20 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix invalid configurations being added to bearermonitor list. | Aaron McCarthy | 2010-12-15 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Fix drag velocity smoothing in QScroller. | Robert Griebl | 2010-12-15 | 1 | -1/+1 |
* | | | Make QScroller examples Qt-namespace safe. | Robert Griebl | 2010-12-15 | 3 | -1/+6 |
* | | | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil... | Qt Continuous Integration System | 2010-12-14 | 2 | -2/+2 |
|\ \ \ | |||||
| * \ \ | Merge branch 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-fil... | Qt Continuous Integration System | 2010-12-07 | 2 | -2/+2 |
| |\ \ \ | |||||
| | * \ \ | Merge remote branch 'origin/master' into file-engine-refactor | João Abecasis | 2010-12-02 | 1 | -2/+3 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote branch 'qt/master' into file-engine-refactor | João Abecasis | 2010-11-23 | 106 | -385/+4974 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix deployment for examples and tests | Shane Kearns | 2010-10-12 | 2 | -2/+2 |
* | | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-06 | 2 | -2/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | / / | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Add 'Writing New Components' docs, and document the connect() function. | Bea Lam | 2010-12-03 | 2 | -2/+9 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-12-02 | 14 | -0/+2156 |
|\ \ \ \ \ | |||||
| * | | | | | Simple fixes for CI gate | Robert Griebl | 2010-12-02 | 1 | -0/+40 |
| * | | | | | QScroller merge, part 1 | Robert Griebl | 2010-12-02 | 14 | -0/+2116 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Make QtScript examples compile | Kent Hansen | 2010-12-02 | 2 | -0/+5 |
|/ / / / | |||||
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-25 | 1 | -2/+3 |
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | |||||
| * | | Localize .loc and .pkg content based on TRANSLATIONS | Miikka Heikkinen | 2010-11-12 | 1 | -2/+3 |
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-12 | 2 | -10/+12 |
|\ \ \ | |/ / | |||||
| * | | doc | Warwick Allison | 2010-11-09 | 1 | -1/+1 |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-11-05 | 1 | -9/+11 |
| |\ \ | |||||
| | * | | highlightranges.qml example and visual test contained binding loop. | Martin Jones | 2010-11-03 | 1 | -9/+11 |
* | | | | compile fix for namespaced Qt | hjk | 2010-11-08 | 2 | -1/+5 |
* | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-11-04 | 7 | -295/+353 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix bearermonitor when building for Maemo in scratchbox. | Aaron McCarthy | 2010-11-04 | 7 | -295/+353 |
| |/ / | |||||
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-27 | 1 | -1/+4 |
|\ \ \ | |/ / | |||||
| * | | Fix empty mifconv TARGETFILE in some edge cases. | Miikka Heikkinen | 2010-10-26 | 1 | -1/+4 |
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-25 | 57 | -2/+3734 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integration | Qt Continuous Integration System | 2010-10-25 | 57 | -2/+3734 |
| |\ \ | |||||
| | * \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-22 | 1 | -41/+0 |
| | |\ \ | |||||
| | * \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-20 | 1 | -16/+18 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-20 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | * | | | | | Fixed case of a library file name to enable MinGW builds on Fedora. | David Boddie | 2010-10-20 | 1 | -2/+2 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-15 | 2 | -1/+109 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.7-upstream' into 4.7-doc | A-Team | 2010-10-14 | 2 | -1/+109 |
| | | |\ \ \ \ \ | |||||
| | * | \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7 | David Boddie | 2010-10-08 | 5 | -47/+198 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Resized image, added missing files, and reformatted documentation of | Jerome Pasion | 2010-10-08 | 5 | -47/+198 |