Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 24 | -654/+630 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 106 | -2926/+2820 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 25 | -689/+664 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 6 | -168/+162 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 58 | -1600/+1542 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 87 | -2395/+2308 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 14 | -380/+366 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 9 | -245/+236 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 27 | -739/+712 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 31 | -839/+808 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 18 | -494/+476 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 23 | -625/+602 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 6 | -162/+156 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 7 | -191/+184 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 12 | -348/+336 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 6 | -166/+160 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 36 | -988/+952 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 3 | -83/+80 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 62 | -1702/+1640 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 94 | -2570/+2476 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 14 | -386/+372 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 21 | -577/+556 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 20 | -552/+532 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 11 | -303/+292 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 16 | -446/+430 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 87 | -2375/+2288 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 9 | -249/+240 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 17 | -471/+454 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 63 | -1723/+1660 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 5 | -139/+134 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 11 | -303/+292 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 31 | -861/+830 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 27 | -747/+720 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 6 | -166/+160 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 31 | -845/+814 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 82 | -2236/+2154 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 26 | -728/+702 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 19 | -519/+500 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Doc: Updated example license to three clause BSD license. | David Boddie | 2010-05-19 | 28 | -776/+748 |
| | | | | | Reviewed-by: Trust Me Requested-by: Legal | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7 | David Boddie | 2010-05-19 | 538 | -57938/+16140 |
|\ | |||||
| * | Fixed an assert in QMenu | Thierry Bastian | 2010-05-19 | 2 | -11/+55 |
| | | | | | | | | | | | | | | | | The code was changed and changed the behaviour. This is basically a kind of revert. Reviewed-By: gabi Task-Number: QTBUG-10735 | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵ | Qt Continuous Integration System | 2010-05-19 | 5 | -9/+27 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix platform regression: Support QFont::setStretch() on Cocoa Fix a memory leak from QItemSelectionModel when changing the model Small hack to allow forcing off font smoothing on Mac OS X | ||||
| | * | Fix platform regression: Support QFont::setStretch() on Cocoa | Eskil Abrahamsen Blomfeldt | 2010-05-19 | 2 | -6/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | QFont::setStretch() would previously have no effect on Mac OS X/Cocoa. Task-number: QTBUG-10585 Reviewed-by: Eskil Done-by: Andy | ||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵ | Qt Continuous Integration System | 2010-05-19 | 341 | -56727/+25 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: removed test file, part of mediaservice removal. Rebuild configure.exe Rebuild configure following the removal of media services. More mediaservices removal work. Removed mediaservices. | ||||
| | * | | removed test file, part of mediaservice removal. | Kurt Korbatits | 2010-05-19 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | Reviewed-by:Justin McPherson | ||||
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵ | Qt Continuous Integration System | 2010-05-18 | 340 | -56727/+25 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Rebuild configure following the removal of media services. More mediaservices removal work. Removed mediaservices. | ||||
| | | * | | Rebuild configure.exe | Andrew den Exter | 2010-05-18 | 1 | -0/+0 |
| | | | | | |||||
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | Andrew den Exter | 2010-05-18 | 1362 | -11510/+22502 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/imports/multimedia/qdeclarativeaudio.cpp src/imports/multimedia/qdeclarativeaudio_p.h src/multimedia/mediaservices/mediaservices.pro src/plugins/mediaservices/mediaservices.pro src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h src/s60installs/s60installs.pro src/src.pro | ||||
| | | * | | | Rebuild configure following the removal of media services. | Andrew den Exter | 2010-05-18 | 1 | -0/+0 |
| | | | | | | |||||
| | | * | | | More mediaservices removal work. | Derick Hawcroft | 2010-05-18 | 1 | -11/+1 |
| | | | | | |