summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mobility/master' into master-from-1.1Andrew Stanley-Jones2011-04-207-31/+50
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframewo...Qt Continuous Integration System2011-04-201-23/+2
| |\
| | * Merge branch 'master' of ../qtmobilityAlex2011-04-1821-109/+342
| | |\
| | * | Fix sfwecho exampleAndrew Stanley-Jones2011-04-141-23/+2
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ...Qt Continuous Integration System2011-04-193-8/+43
| |\ \ \
| | * | | Make the tablewidgetitems showing landmark/categories not editableabcd2011-04-191-7/+25
| | * | | make it easier to assign a category to a landmarkabcd2011-04-191-1/+4
| | * | | Make assigning a category to a landmark easierabcd2011-04-192-0/+14
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia int...Qt Continuous Integration System2011-04-181-0/+2
| |\ \ \ \
| | * | | | Declarative camera example: set initial view geometryDmytro Poplavskiy2011-04-181-0/+2
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ...Qt Continuous Integration System2011-04-182-0/+3
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | |
| | * | | Provide default import file for declarative landamrk exampleabcd2011-04-152-0/+3
* | | | | Merge branch 'master' of ../qtmobility into master-from-1.1Alex2011-04-183-1/+80
|\| | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/sensors into maste...Qt Continuous Integration System2011-04-153-1/+80
| |\ \ \ \
| | * | | | show_reflectancep2niemel2011-04-131-1/+2
| | * | | | added irproxy testp2niemel2011-04-082-0/+78
* | | | | | Merge branch 'master' of ../qtmobility into master-from-1.1Alex2011-04-154-9/+52
|\| | | | |
| * | | | | Merge branch 'master-stable' of scm.dev.nokia.troll.no:qtmobility/qtm-connect...Qt Continuous Integration System2011-04-154-9/+52
| |\ \ \ \ \
| | * | | | | Start and stop target detection as needed.Aaron McCarthy2011-04-141-4/+5
| | * | | | | Return a RequestId from NDEF read/write functions.Aaron McCarthy2011-04-143-7/+47
| | * | | | | tst_qbluetoothdevicediscoveryagent fix for symbianJaakko Lipasti2011-04-131-0/+2
* | | | | | | Merge branch 'master' of ../qtmobility into master-from-1.1Alex2011-04-155-88/+112
|\| | | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia int...Qt Continuous Integration System2011-04-153-88/+105
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | QML Camera example: Do not use hard coded base rect sizeTuomas Viitanen2011-04-131-2/+0
| | * | | | | Camera Example: Use self-signable capabilities on SymbianTuomas Viitanen2011-04-131-1/+1
| | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobility into mu...Michael Goddard2011-04-1243-1359/+1905
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | * | | | | Made qml_camera example more resolution independentDmytro Poplavskiy2011-04-082-85/+104
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo int...Qt Continuous Integration System2011-04-142-0/+7
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | fix currentFlow on harmattanLorn Potter2011-04-072-0/+7
| | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'master' of ../qtmobility into master-from-1.1Alex2011-04-149-11/+98
|\| | | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ...Qt Continuous Integration System2011-04-129-11/+98
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-locationjuhvu2011-04-118-42/+89
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of ../mainline-repoDavid Laing2011-04-088-42/+89
| | | |\ \ \ \
| | * | | | | | MOBILITY-1955 Test robustness on harmattan and example fixes.juhvu2011-04-083-9/+9
| | |/ / / / /
| | * | | | | Provide default import file mylm.lmx for declarative landmarkmap exampleabcd2011-04-086-2/+89
* | | | | | | Merge branch '1.1' of ../qtmobility into master-from-1.1Alex2011-04-141-3/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into 1...Qt Continuous Integration System2011-04-061-3/+0
| |\ \ \ \ \ \
| | * | | | | | Remove duplicate signal connections.Michael Goddard2011-04-061-3/+0
* | | | | | | | Merge branch 'master-stable' of scm.dev.nokia.troll.no:qtmobility/qtm-connect...Qt Continuous Integration System2011-04-121-10/+12
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | / | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix new collision detectionAndrew Stanley-Jones2011-04-071-10/+12
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia int...Qt Continuous Integration System2011-04-081-6/+7
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix camera example orientation on symbian.Tuomas Viitanen2011-04-051-6/+7
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-calendar into ...Qt Continuous Integration System2011-04-081-9/+22
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix for calendardemoPäivi Rajala2011-04-071-9/+22
* | | | | | Merge branch 'master-stable' of scm.dev.nokia.troll.no:qtmobility/qtm-connect...Qt Continuous Integration System2011-04-066-27/+60
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Add FPS to Bluetooth Tennis and misc fixesAndrew Stanley-Jones2011-04-066-27/+60
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ...Qt Continuous Integration System2011-04-053-41/+41
|\ \ \ \ \ \
| * | | | | | Fix minor issues with declarative landmark map exampleabcd2011-04-053-41/+41
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ...Qt Continuous Integration System2011-04-051-77/+15
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | Fixes some problems with the Maps QML bindingsDavid Laing2011-04-041-77/+15