Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-18 | 18 | -31/+37 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.... | Qt Continuous Integration System | 2010-04-16 | 18 | -31/+37 |
| |\ | |||||
| | * | Merge branch '4.7' of ../../qt/4.7 into 4.7 | Justin McPherson | 2010-04-16 | 12 | -4/+147 |
| | |\ | |||||
| | * \ | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int... | Justin McPherson | 2010-04-15 | 156 | -1328/+1819 |
| | |\ \ | |||||
| | * | | | Create Mediaservices lib, separate from Multimedia. | Justin McPherson | 2010-04-15 | 18 | -31/+37 |
* | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Olivier Goffart | 2010-04-16 | 15 | -54/+299 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | create magic comment messages in "finished" state | Oswald Buddenhagen | 2010-04-15 | 1 | -1/+1 |
| * | | | | make QT_TR_NOOP work in static initializers | Oswald Buddenhagen | 2010-04-15 | 2 | -0/+40 |
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-04-15 | 2 | -1/+35 |
| |\ \ \ \ | |||||
| | * | | | | QtScript: Add autotest for enumeration of QMetaObject properties | Kent Hansen | 2010-04-15 | 1 | -0/+34 |
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-04-15 | 1 | -1/+1 |
| | |\ \ \ \ | |||||
| | | * | | | | QNAM HTTP: Pipelining changes | Markus Goetz | 2010-04-15 | 1 | -1/+1 |
| * | | | | | | Fixes auto-test failure for 9da13ea53aec6d841ba7f416531d6c52d4368df4. | Yoann Lopes | 2010-04-15 | 1 | -19/+0 |
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-04-15 | 1 | -22/+77 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Fixes tooltips for QGraphicsProxyWidget. | Yoann Lopes | 2010-04-15 | 1 | -22/+77 |
| * | | | | | | Phonon MMF: calling pause() when in StoppedState triggers stateChanged() | Gareth Stockwell | 2010-04-15 | 1 | -1/+1 |
| * | | | | | | tst_mediaobject: ensure MediaObject is in StoppedState before each step | Gareth Stockwell | 2010-04-15 | 1 | -0/+7 |
| * | | | | | | tst_mediaobject: Removed non-portable escape codes from output | Gareth Stockwell | 2010-04-15 | 1 | -8/+2 |
| * | | | | | | tst_mediaobject: Ensure playSDP step cleanup is run | Gareth Stockwell | 2010-04-15 | 1 | -5/+10 |
| * | | | | | | tst_mediaobject: Removed compiler warnings | Gareth Stockwell | 2010-04-15 | 2 | -4/+2 |
| * | | | | | | tst_mediaobject: Removed compiler warnings | Gareth Stockwell | 2010-04-15 | 1 | -6/+0 |
| | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ... | Qt Continuous Integration System | 2010-04-14 | 5 | -0/+91 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| | * | | | | QtScript: Add tests for translation of multiple scripts | Kent Hansen | 2010-04-14 | 4 | -0/+81 |
| | * | | | | QtScript: Add test for translation disambiguation | Kent Hansen | 2010-04-14 | 4 | -0/+10 |
| * | | | | | merge commit c638ddc70f6a8196f2c8b11808ab01510233a0ee from harfbuzz: | Lars Knoll | 2010-04-14 | 1 | -0/+2 |
| |/ / / / | |||||
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ... | Qt Continuous Integration System | 2010-04-14 | 1 | -6/+8 |
| |\ \ \ \ | |||||
| | * | | | | QAbstractScrollArea StyleSheet: fix drawing of border with SH_ScrollView_Fram... | Olivier Goffart | 2010-04-14 | 1 | -6/+8 |
| * | | | | | Improve test coverage of QtScript translation functions | Kent Hansen | 2010-04-14 | 1 | -0/+42 |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-15 | 67 | -1546/+419 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-04-15 | 67 | -1546/+419 |
| |\ \ \ \ \ | |||||
| | * | | | | | Update examples autotest to use the runtime directly | Aaron Kennedy | 2010-04-15 | 2 | -79/+26 |
| | * | | | | | Support valuetypes as method return values | Aaron Kennedy | 2010-04-15 | 4 | -1/+34 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-15 | 6 | -5/+52 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-04-15 | 49 | -1443/+184 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Add Component.onDestruction attached property | Aaron Kennedy | 2010-04-15 | 6 | -5/+52 |
| | * | | | | | | | Simplify dynamic resource loading to avoid cluttering Text API. | Warwick Allison | 2010-04-15 | 1 | -1/+5 |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-15 | 20 | -1422/+91 |
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | | | |||||
| | | * | | | | | | Visual test updates. | Michael Brasser | 2010-04-15 | 20 | -1422/+91 |
| | * | | | | | | | Use qmlInfo for image loading errors, not qWarning(). | Warwick Allison | 2010-04-15 | 5 | -20/+28 |
| | |/ / / / / / | |||||
| | * | | | | | | Correctly resolve, and load, IMG tags in Text element. | Warwick Allison | 2010-04-15 | 7 | -0/+72 |
| | * | | | | | | Rename "sql" test so autotester doesn't get confused. | Warwick Allison | 2010-04-15 | 20 | -20/+20 |
| | * | | | | | | Should work now, don't skip. | Warwick Allison | 2010-04-15 | 1 | -1/+0 |
| | * | | | | | | ignore autotester logs | Warwick Allison | 2010-04-15 | 1 | -0/+1 |
| | |/ / / / / | |||||
| | * | | | | | Add flow property to Grid, adding TopToBottom mode. | Martin Jones | 2010-04-15 | 2 | -0/+73 |
| | * | | | | | Make sure richtext wraps correctly with a fixed height set. | Martin Jones | 2010-04-15 | 1 | -0/+20 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | QListView: Re-fix scrollbar ranges | Gabriel de Dietrich | 2010-04-15 | 1 | -0/+30 |
|/ / / / / | |||||
* | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-04-15 | 11 | -4/+117 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2010-04-14 | 11 | -4/+117 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6 | Thiago Macieira | 2010-04-14 | 11 | -4/+117 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | tst_qftp: Attempting to reproduce a crash | Markus Goetz | 2010-04-13 | 1 | -0/+26 |