Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Rhys Weatherley | 2010-02-24 | 13 | -2/+1854 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-23 | 13 | -2/+1854 |
| |\ | |||||
| | * | 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 | 11 | -0/+1851 |
| | | |\ | |||||
| | | | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-20 | 11 | -0/+1851 |
| | | | |\ | |||||
| | | | | * | Merge remote branch 'origin/master' into mobility-master | Rohan McGovern | 2010-02-19 | 186 | -775/+13612 |
| | | | | |\ | |||||
| | * | | | | | 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 | 326 | -1091/+14354 |
| | |\ \ \ \ \ | | | |/ / / / | | | | | / / | | | |_|/ / | | |/| | | | |||||
| | * | | | | 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 | 25 | -82/+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 | 1515 | -1/+175223 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | 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 | 56 | -217/+1583 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge remote branch 'origin/4.6' into bearermanagement/integration | Aaron McCarthy | 2010-02-11 | 37 | -288/+9249 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | 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 | 1333 | -3479/+8770 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | 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 | 10 | -51/+20 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | 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 | 4 | -4/+4 |
| | | * | | | | | | | | | | Make compile. | Aaron McCarthy | 2009-12-22 | 9 | -52/+11 |
| | * | | | | | | | | | | | Bearer Management Integration 2. | Aaron McCarthy | 2010-01-04 | 8 | -49/+67 |
| | |/ / / / / / / / / / | |||||
| | * | | | | | | | | | | Bearer Management Integration 1. | Aaron McCarthy | 2009-12-22 | 10 | -0/+1788 |
* | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-23 | 5 | -50/+155 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | Skip complex FBO tests if combined depth-stencil isn't supported | Tom Cooksey | 2010-02-23 | 1 | -1/+16 |
| * | | | | | | | | | | | Make tst_QGL::glWidgetRendering use same test as FBO autotest | Tom Cooksey | 2010-02-23 | 1 | -39/+47 |
| * | | | | | | | | | | | Made the qDrawPixmaps() API public (with modifications). | Trond Kjernåsen | 2010-02-23 | 1 | -2/+46 |
| * | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-02-23 | 3 | -8/+46 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | QSortFilterProxyModel: Sorting occured unnecessarily when the dynamicSortFilt... | Olivier Goffart | 2010-02-22 | 1 | -4/+34 |
| | * | | | | | | | | | | | Fix test with gcc 4.0 where QT_USE_FAST_CONCATENATION cannot be enabled. | Olivier Goffart | 2010-02-22 | 1 | -3/+11 |
| | * | | | | | | | | | | | Compile | Paul Olav Tvete | 2010-02-22 | 1 | -1/+1 |
| | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-23 | 76 | -837/+758 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-02-23 | 2 | -1/+15 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge remote branch 'origin/4.6' into integration-master-from-4.6 | Rohan McGovern | 2010-02-22 | 2 | -1/+15 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | | | |||||
| | | * | | | | | | | | | | Don't process uic3 subdir if qt3support is disabled. | Rohan McGovern | 2010-02-22 | 1 | -1/+3 |
| | | * | | | | | | | | | | Fixed failure of tst_symbols when Qt is configured with -qtnamespace | Rohan McGovern | 2010-02-22 | 1 | -0/+12 |
| * | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into master-integra... | Qt Continuous Integration System | 2010-02-22 | 74 | -836/+743 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Replace QmlList* and QList* support with a single QmlListProperty type | Aaron Kennedy | 2010-02-22 | 21 | -720/+643 |
| | * | | | | | | | | | | | Rename MouseRegion -> MouseArea | Martin Jones | 2010-02-22 | 49 | -69/+69 |
| | * | | | | | | | | | | | Increase durations when testing Behaviors. | Michael Brasser | 2010-02-22 | 10 | -24/+24 |
| | * | | | | | | | | | | | Remove use of direct event posting. Use QTest::keyClick() for keys. | Martin Jones | 2010-02-22 | 1 | -23/+7 |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
* | | | | | | | | | | | | Use QTRY_COMPARE to give the animation a chance to finish | Kent Hansen | 2010-02-23 | 1 | -1/+2 |