Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mobility/master' into master-from-1.1 | Andrew Stanley-Jones | 2011-04-20 | 7 | -31/+50 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframewo... | Qt Continuous Integration System | 2011-04-20 | 1 | -23/+2 |
| |\ | |||||
| | * | Merge branch 'master' of ../qtmobility | Alex | 2011-04-18 | 21 | -109/+342 |
| | |\ | |||||
| | * | | Fix sfwecho example | Andrew Stanley-Jones | 2011-04-14 | 1 | -23/+2 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ... | Qt Continuous Integration System | 2011-04-19 | 3 | -8/+43 |
| |\ \ \ | |||||
| | * | | | Make the tablewidgetitems showing landmark/categories not editable | abcd | 2011-04-19 | 1 | -7/+25 |
| | * | | | make it easier to assign a category to a landmark | abcd | 2011-04-19 | 1 | -1/+4 |
| | * | | | Make assigning a category to a landmark easier | abcd | 2011-04-19 | 2 | -0/+14 |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia int... | Qt Continuous Integration System | 2011-04-18 | 1 | -0/+2 |
| |\ \ \ \ | |||||
| | * | | | | Declarative camera example: set initial view geometry | Dmytro Poplavskiy | 2011-04-18 | 1 | -0/+2 |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ... | Qt Continuous Integration System | 2011-04-18 | 2 | -0/+3 |
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | | |||||
| | * | | | Provide default import file for declarative landamrk example | abcd | 2011-04-15 | 2 | -0/+3 |
* | | | | | Merge branch 'master' of ../qtmobility into master-from-1.1 | Alex | 2011-04-18 | 3 | -1/+80 |
|\| | | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/sensors into maste... | Qt Continuous Integration System | 2011-04-15 | 3 | -1/+80 |
| |\ \ \ \ | |||||
| | * | | | | show_reflectance | p2niemel | 2011-04-13 | 1 | -1/+2 |
| | * | | | | added irproxy test | p2niemel | 2011-04-08 | 2 | -0/+78 |
* | | | | | | Merge branch 'master' of ../qtmobility into master-from-1.1 | Alex | 2011-04-15 | 4 | -9/+52 |
|\| | | | | | |||||
| * | | | | | Merge branch 'master-stable' of scm.dev.nokia.troll.no:qtmobility/qtm-connect... | Qt Continuous Integration System | 2011-04-15 | 4 | -9/+52 |
| |\ \ \ \ \ | |||||
| | * | | | | | Start and stop target detection as needed. | Aaron McCarthy | 2011-04-14 | 1 | -4/+5 |
| | * | | | | | Return a RequestId from NDEF read/write functions. | Aaron McCarthy | 2011-04-14 | 3 | -7/+47 |
| | * | | | | | tst_qbluetoothdevicediscoveryagent fix for symbian | Jaakko Lipasti | 2011-04-13 | 1 | -0/+2 |
* | | | | | | | Merge branch 'master' of ../qtmobility into master-from-1.1 | Alex | 2011-04-15 | 5 | -88/+112 |
|\| | | | | | | |||||
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia int... | Qt Continuous Integration System | 2011-04-15 | 3 | -88/+105 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | QML Camera example: Do not use hard coded base rect size | Tuomas Viitanen | 2011-04-13 | 1 | -2/+0 |
| | * | | | | | Camera Example: Use self-signable capabilities on Symbian | Tuomas Viitanen | 2011-04-13 | 1 | -1/+1 |
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility into mu... | Michael Goddard | 2011-04-12 | 43 | -1359/+1905 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | * | | | | | Made qml_camera example more resolution independent | Dmytro Poplavskiy | 2011-04-08 | 2 | -85/+104 |
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo int... | Qt Continuous Integration System | 2011-04-14 | 2 | -0/+7 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | fix currentFlow on harmattan | Lorn Potter | 2011-04-07 | 2 | -0/+7 |
| | | |_|_|/ | | |/| | | | |||||
* | | | | | | Merge branch 'master' of ../qtmobility into master-from-1.1 | Alex | 2011-04-14 | 9 | -11/+98 |
|\| | | | | | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ... | Qt Continuous Integration System | 2011-04-12 | 9 | -11/+98 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location | juhvu | 2011-04-11 | 8 | -42/+89 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of ../mainline-repo | David Laing | 2011-04-08 | 8 | -42/+89 |
| | | |\ \ \ \ | |||||
| | * | | | | | | MOBILITY-1955 Test robustness on harmattan and example fixes. | juhvu | 2011-04-08 | 3 | -9/+9 |
| | |/ / / / / | |||||
| | * | | | | | Provide default import file mylm.lmx for declarative landmarkmap example | abcd | 2011-04-08 | 6 | -2/+89 |
* | | | | | | | Merge branch '1.1' of ../qtmobility into master-from-1.1 | Alex | 2011-04-14 | 1 | -3/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into 1... | Qt Continuous Integration System | 2011-04-06 | 1 | -3/+0 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Remove duplicate signal connections. | Michael Goddard | 2011-04-06 | 1 | -3/+0 |
* | | | | | | | | Merge branch 'master-stable' of scm.dev.nokia.troll.no:qtmobility/qtm-connect... | Qt Continuous Integration System | 2011-04-12 | 1 | -10/+12 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Fix new collision detection | Andrew Stanley-Jones | 2011-04-07 | 1 | -10/+12 |
| | |_|_|/ / | |/| | | | | |||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia int... | Qt Continuous Integration System | 2011-04-08 | 1 | -6/+7 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Fix camera example orientation on symbian. | Tuomas Viitanen | 2011-04-05 | 1 | -6/+7 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-calendar into ... | Qt Continuous Integration System | 2011-04-08 | 1 | -9/+22 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Fix for calendardemo | Päivi Rajala | 2011-04-07 | 1 | -9/+22 |
* | | | | | | Merge branch 'master-stable' of scm.dev.nokia.troll.no:qtmobility/qtm-connect... | Qt Continuous Integration System | 2011-04-06 | 6 | -27/+60 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Add FPS to Bluetooth Tennis and misc fixes | Andrew Stanley-Jones | 2011-04-06 | 6 | -27/+60 |
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ... | Qt Continuous Integration System | 2011-04-05 | 3 | -41/+41 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix minor issues with declarative landmark map example | abcd | 2011-04-05 | 3 | -41/+41 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ... | Qt Continuous Integration System | 2011-04-05 | 1 | -77/+15 |
|\| | | | | | | |/ / / / / |/| | | | | | |||||
| * | | | | | Fixes some problems with the Maps QML bindings | David Laing | 2011-04-04 | 1 | -77/+15 |