summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-242-1/+14
|\
| * QMediaContent test; make sure to use network.Justin McPherson2010-02-241-1/+1
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-241-0/+13
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-231-0/+13
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-231-0/+13
| | | |\
| | | | * Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-231-0/+13
* | | | | Make QDeclarativeMetaType and QDeclarativeType privateAaron Kennedy2010-02-243-3/+6
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-249-1/+6
|\ \ \ \ \
| * | | | | Fixup tests after QDeclarative class renamesAaron Kennedy2010-02-244-1/+1
| * | | | | Simplify QML element registration headersAaron Kennedy2010-02-245-0/+5
* | | | | | Don't crash if the currentIndex is set while creating a delegate.Martin Jones2010-02-242-0/+48
|/ / / / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-245-6/+41
|\ \ \ \ \
| * | | | | Add an "asynchonous" property to Image.Martin Jones2010-02-242-6/+12
| * | | | | Make compile following renaming of class.Bea Lam2010-02-241-1/+1
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2461-892/+892
| |\ \ \ \ \
| * | | | | | Automatically connect to a notify signal if the requested signal isBea Lam2010-02-243-0/+29
* | | | | | | Manually merge 0f761d9d95bc187cb786ce7dc03a7d8c9ad9d779Warwick Allison2010-02-242-2/+2
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2461-892/+892
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Change autotest class prefix from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX t...Leonardo Sobral Cunha2010-02-2460-891/+891
| * | | | | | Fix declarative failing auto-test, missing rename of the test fileLeonardo Sobral Cunha2010-02-242-1/+1
| |/ / / / /
* | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtWarwick Allison2010-02-2428-0/+4851
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-2330-2/+4853
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221-0/+1
| | |\ \ \
| | | * | | Fixed qnetworksession test on Mac.Rohan McGovern2010-02-211-0/+1
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-2028-0/+4850
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-2028-0/+4850
| | | | |\ \
| | | | | * \ Merge remote branch 'origin/master' into mobility-masterRohan McGovern2010-02-19217-815/+14020
| | | | | |\ \
| | * | | | | | Increase try verify timeout.Aaron McCarthy2010-02-222-2/+2
| | * | | | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-22505-1327/+33276
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | / / / | | | |_|/ / / | | |/| | | |
| | * | | | | Create unit-test in parent directory.Aaron McCarthy2010-02-193-1/+12
| | * | | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-1726-83/+82
| | |\ \ \ \ \
| | * | | | | | Fix QNetworkSession unit test.Aaron McCarthy2010-02-163-10/+14
| | * | | | | | Make this a warning.Aaron McCarthy2010-02-161-2/+2
| | * | | | | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-141582-1/+178279
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge remote branch 'origin/master' into master-mobilityRohan McGovern2010-02-115-5/+114
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-1166-242/+3093
| | |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-11274-3535/+9734
| | |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge commit 'BearerIntegration-5' into remove-manual-testAaron McCarthy2010-02-034-20/+53
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bearer Management Integration 5.Aaron McCarthy2010-02-034-20/+52
| | * | | | | | | | | | | Merge commit 'origin/4.6' into bearermanagement/integration-4Aaron McCarthy2010-01-291494-3770/+12158
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge commit 'BearerIntegration-4' into bearermanagement/integration-4Aaron McCarthy2010-01-293-1/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Bearer Management Integration 4.Aaron McCarthy2010-01-293-0/+18
| | * | | | | | | | | | | | Port session functionality.Aaron McCarthy2010-01-181-3/+13
| | * | | | | | | | | | | | Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2Aaron McCarthy2010-01-0522-85/+41
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Update license headers.Aaron McCarthy2009-12-221-1/+1
| | | * | | | | | | | | | | Fix QNetworkSession unit tests.Aaron McCarthy2009-12-221-2/+4
| | | * | | | | | | | | | | Make unit tests compile.Aaron McCarthy2009-12-221-1/+1
| | | * | | | | | | | | | | Fix up license headers.Aaron McCarthy2009-12-2214-14/+21
| | | * | | | | | | | | | | Make compile.Aaron McCarthy2009-12-2214-81/+14
| | * | | | | | | | | | | | Bearer Management Integration 2.Aaron McCarthy2010-01-0414-81/+93
| | |/ / / / / / / / / / /