| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| | | | * | | | | | | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-18 | 81 | -75/+431 |
| | | | |\ \ \ \ \ \
| | | | | | |_|_|/ /
| | | | | |/| | | | |
|
| | * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ma... | Qt Continuous Integration System | 2010-02-19 | 30 | -0/+9072 |
| | |\ \ \ \ \ \ \ \
| | | |/ / / / / / /
| | |/| | | | | | | |
|
| | | * | | | | | | | Complete namespace move; QtMedia -> QtMultimedia | Justin McPherson | 2010-02-19 | 4 | -47/+47 |
|
|
| | | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ma... | Qt Continuous Integration System | 2010-02-18 | 30 | -0/+9072 |
| | | |\ \ \ \ \ \ \
| | | | |_|/ / / / /
| | | |/| | | | | | |
|
| | | | * | | | | | | Disable the full screen video widget tests on X11. | Andrew den Exter | 2010-02-18 | 1 | -3/+8 |
|
|
| | | | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into ma... | Qt Continuous Integration System | 2010-02-18 | 30 | -0/+9067 |
| | | | |\ \ \ \ \ \
| | | | | |_|/ / / /
| | | | |/| | | | | |
|
| | | | | * | | | | | Fix qmlgraphicsvideo.pro | Justin McPherson | 2010-02-17 | 1 | -1/+1 |
|
|
| | | | | * | | | | | Add qmlgraphicsvideo test to auto.pro | Justin McPherson | 2010-02-17 | 1 | -0/+1 |
|
|
| | | | | * | | | | | Fix QMediaServiceProvider test. | Justin McPherson | 2010-02-17 | 1 | -2/+3 |
|
|
| | | | | * | | | | | Make QMediaPlaylist test pass. | Andrew den Exter | 2010-02-17 | 1 | -1/+0 |
|
|
| | | | | * | | | | | Fix QMediaPlayer test failure. | Andrew den Exter | 2010-02-17 | 1 | -28/+1 |
|
|
| | | | | * | | | | | Fix qmlaudio.pro. | Justin McPherson | 2010-02-17 | 1 | -1/+1 |
|
|
| | | | | * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team | Justin McPherson | 2010-02-17 | 1 | -0/+2 |
| | | | | |\ \ \ \ \ |
|
| | | | | | * | | | | | Make QMediaPlayer test compile. | Andrew den Exter | 2010-02-17 | 1 | -0/+2 |
|
|
| | | | | * | | | | | | Remove tests not relevant to playback functionality. | Justin McPherson | 2010-02-17 | 1 | -52/+2 |
|
|
| | | | | * | | | | | | Remove tests that depend on playlist plugins. | Justin McPherson | 2010-02-17 | 1 | -28/+0 |
|
|
| | | | | * | | | | | | Add qmlaudio test to auto.pro | Justin McPherson | 2010-02-17 | 1 | -0/+1 |
|
|
| | | | | * | | | | | | Fix license headers. | Justin McPherson | 2010-02-17 | 11 | -22/+22 |
| | | | | |/ / / / / |
|
| | | | | * | | | | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-14 | 1549 | -244/+176500 |
| | | | | |\ \ \ \ \
| | | | | | | |_|/ /
| | | | | | |/| | | |
|
| | | | | * | | | | | Don't clear the video output when the video widget is hidden. | Andrew den Exter | 2010-02-08 | 2 | -4/+4 |
|
|
| | | | | * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Justin McPherson | 2010-02-05 | 105 | -203/+9668 |
| | | | | |\ \ \ \ \ |
|
| | | | | * | | | | | | Add tests for QML media elements. | Andrew den Exter | 2010-02-05 | 4 | -0/+2123 |
|
|
| | | | | * | | | | | | Fix license headers. | Andrew den Exter | 2010-02-05 | 1 | -2/+2 |
|
|
| | | | | * | | | | | | Added QNetworkRequest constructor to QMediaResource. | Nicholas Young | 2010-02-04 | 2 | -1/+46 |
|
|
| | | | | * | | | | | | Add tests fro QGraphicsVideoItem. | Andrew den Exter | 2010-02-03 | 3 | -0/+676 |
|
|
| | | | | * | | | | | | Merge ../../qt/master | Justin McPherson | 2010-01-29 | 35 | -964/+729 |
| | | | | |\ \ \ \ \ \ |
|
| | | | | * | | | | | | | Move QtMobility multimedia framework into Qt. | Justin McPherson | 2010-01-15 | 25 | -0/+6335 |
|
|
| * | | | | | | | | | | | Fix fallback for QStaticText when it's unsupported in paint engine | Eskil Abrahamsen Blomfeldt | 2010-02-19 | 2 | -2/+17 |
| | |_|_|_|_|_|_|/ / /
| |/| | | | | | | | | |
|
| * | | | | | | | | | | Fix threaded gl autotest build failure on GLES2 | Tom Cooksey | 2010-02-18 | 2 | -13/+20 |
|
|
| * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 | Gunnar Sletta | 2010-02-18 | 1 | -0/+57 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | Fixes crash when destroying a QGraphicsItem. | Yoann Lopes | 2010-02-17 | 1 | -0/+57 |
|
|
| * | | | | | | | | | | | Make threading use-cases work for X11 | Gunnar Sletta | 2010-02-18 | 1 | -12/+28 |
| |/ / / / / / / / / / |
|
| * | | | | | | | | | | Some threading improvements to the GL module | Gunnar Sletta | 2010-02-17 | 4 | -0/+519 |
|
|
| * | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-17 | 4 | -12/+457 |
| |\ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / /
| |/| | | | | | | | | |
|
| | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 | Jason McDonald | 2010-02-16 | 1 | -10/+11 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | Rename QStaticText::setUseBackendOptimizations to setPerformanceHint() | Eskil Abrahamsen Blomfeldt | 2010-02-16 | 1 | -10/+11 |
|
|
| | * | | | | | | | | | | Fix license headers. | Jason McDonald | 2010-02-16 | 1 | -16/+16 |
| | |/ / / / / / / / / |
|
| | * | | | | | | | | | Merge remote branch 'qt/master' into staging-2-master | Qt Continuous Integration System | 2010-02-15 | 1518 | -2/+175355 |
| | |\ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|/ / /
| | | |/| | | | | | | |
|
| | * | | | | | | | | | Merge branch 'qt-graphics-team-qstatictext-4.7' | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 13 | -43/+709 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ | Merge branch 'master' of scm.dev.troll.no:qt/oslo-staging-2 into qstatictext-4.7 | Eskil Abrahamsen Blomfeldt | 2010-02-15 | 60 | -222/+1697 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | Remove fluxuating tests for QStaticText | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 1 | -209/+0 |
|
|
| | | * | | | | | | | | | | Make QStaticText public API again | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 1 | -17/+17 |
|
|
| | | * | | | | | | | | | | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-10 | 13 | -47/+505 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-08 | 7 | -17/+43 |
| | | |\ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | Add tests for using QStaticText with a QGLWidget | Eskil Abrahamsen Blomfeldt | 2010-02-05 | 2 | -1/+212 |
|
|
| | | * | | | | | | | | | | | | Temporarily remove QPainter::drawStaticText() for Qt 4.6.x integration | Eskil Abrahamsen Blomfeldt | 2010-02-05 | 1 | -14/+15 |
|
|
| | | * | | | | | | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into qstat... | Eskil Abrahamsen Blomfeldt | 2010-02-04 | 20 | -180/+8226 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch '4.6' into qstatictext-4.6 | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 105 | -996/+1787 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Fix one test and add tests for backend optimizations | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 1 | -3/+32 |
|
|
| | | * | | | | | | | | | | | | | | Make QStaticText private API | Eskil Abrahamsen Blomfeldt | 2010-02-01 | 1 | -1/+1 |
|
|