Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-24 | 2 | -1/+14 |
|\ | |||||
| * | QMediaContent test; make sure to use network. | Justin McPherson | 2010-02-24 | 1 | -1/+1 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-24 | 1 | -0/+13 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 1 | -0/+13 |
| | |\ | |||||
| | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 1 | -0/+13 |
| | | |\ | |||||
| | | | * | Added QNetworkRequest constructor to QMediaContent. | Nicholas Young | 2010-02-23 | 1 | -0/+13 |
* | | | | | Make QDeclarativeMetaType and QDeclarativeType private | Aaron Kennedy | 2010-02-24 | 3 | -3/+6 |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-24 | 9 | -1/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fixup tests after QDeclarative class renames | Aaron Kennedy | 2010-02-24 | 4 | -1/+1 |
| * | | | | | Simplify QML element registration headers | Aaron Kennedy | 2010-02-24 | 5 | -0/+5 |
* | | | | | | Don't crash if the currentIndex is set while creating a delegate. | Martin Jones | 2010-02-24 | 2 | -0/+48 |
|/ / / / / | |||||
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 5 | -6/+41 |
|\ \ \ \ \ | |||||
| * | | | | | Add an "asynchonous" property to Image. | Martin Jones | 2010-02-24 | 2 | -6/+12 |
| * | | | | | Make compile following renaming of class. | Bea Lam | 2010-02-24 | 1 | -1/+1 |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-24 | 61 | -892/+892 |
| |\ \ \ \ \ | |||||
| * | | | | | | Automatically connect to a notify signal if the requested signal is | Bea Lam | 2010-02-24 | 3 | -0/+29 |
* | | | | | | | Manually merge 0f761d9d95bc187cb786ce7dc03a7d8c9ad9d779 | Warwick Allison | 2010-02-24 | 2 | -2/+2 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 61 | -892/+892 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Change autotest class prefix from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX t... | Leonardo Sobral Cunha | 2010-02-24 | 60 | -891/+891 |
| * | | | | | | Fix declarative failing auto-test, missing rename of the test file | Leonardo Sobral Cunha | 2010-02-24 | 2 | -1/+1 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt | Warwick Allison | 2010-02-24 | 28 | -0/+4851 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-23 | 30 | -2/+4853 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Merge remote branch 'staging/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-22 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | | * | | | Fixed qnetworksession test on Mac. | Rohan McGovern | 2010-02-21 | 1 | -0/+1 |
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-20 | 28 | -0/+4850 |
| | | |\ \ \ | | | | |_|/ | | | |/| | | |||||
| | | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-20 | 28 | -0/+4850 |
| | | | |\ \ | |||||
| | | | | * \ | Merge remote branch 'origin/master' into mobility-master | Rohan McGovern | 2010-02-19 | 217 | -815/+14020 |
| | | | | |\ \ | |||||
| | * | | | | | | Increase try verify timeout. | Aaron McCarthy | 2010-02-22 | 2 | -2/+2 |
| | * | | | | | | Merge remote branch 'origin/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-22 | 505 | -1327/+33276 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | / / / | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Create unit-test in parent directory. | Aaron McCarthy | 2010-02-19 | 3 | -1/+12 |
| | * | | | | | Merge remote branch 'origin/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-17 | 26 | -83/+82 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Fix QNetworkSession unit test. | Aaron McCarthy | 2010-02-16 | 3 | -10/+14 |
| | * | | | | | | Make this a warning. | Aaron McCarthy | 2010-02-16 | 1 | -2/+2 |
| | * | | | | | | Merge remote branch 'origin/master' into bearermanagement/integration | Aaron McCarthy | 2010-02-14 | 1582 | -1/+178279 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge remote branch 'origin/master' into master-mobility | Rohan McGovern | 2010-02-11 | 5 | -5/+114 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge remote branch 'origin/master' into bearermanagement/integration | Aaron McCarthy | 2010-02-11 | 66 | -242/+3093 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge remote branch 'origin/4.6' into bearermanagement/integration | Aaron McCarthy | 2010-02-11 | 274 | -3535/+9734 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge commit 'BearerIntegration-5' into remove-manual-test | Aaron McCarthy | 2010-02-03 | 4 | -20/+53 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | | Bearer Management Integration 5. | Aaron McCarthy | 2010-02-03 | 4 | -20/+52 |
| | * | | | | | | | | | | | Merge commit 'origin/4.6' into bearermanagement/integration-4 | Aaron McCarthy | 2010-01-29 | 1494 | -3770/+12158 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge commit 'BearerIntegration-4' into bearermanagement/integration-4 | Aaron McCarthy | 2010-01-29 | 3 | -1/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Bearer Management Integration 4. | Aaron McCarthy | 2010-01-29 | 3 | -0/+18 |
| | * | | | | | | | | | | | | Port session functionality. | Aaron McCarthy | 2010-01-18 | 1 | -3/+13 |
| | * | | | | | | | | | | | | Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2 | Aaron McCarthy | 2010-01-05 | 22 | -85/+41 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Update license headers. | Aaron McCarthy | 2009-12-22 | 1 | -1/+1 |
| | | * | | | | | | | | | | | Fix QNetworkSession unit tests. | Aaron McCarthy | 2009-12-22 | 1 | -2/+4 |
| | | * | | | | | | | | | | | Make unit tests compile. | Aaron McCarthy | 2009-12-22 | 1 | -1/+1 |
| | | * | | | | | | | | | | | Fix up license headers. | Aaron McCarthy | 2009-12-22 | 14 | -14/+21 |
| | | * | | | | | | | | | | | Make compile. | Aaron McCarthy | 2009-12-22 | 14 | -81/+14 |
| | * | | | | | | | | | | | | Bearer Management Integration 2. | Aaron McCarthy | 2010-01-04 | 14 | -81/+93 |
| | |/ / / / / / / / / / / |