summaryrefslogtreecommitdiffstats
path: root/features
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of ../qtmobilityLorn Potter2011-03-082-4/+16
|\
| * Fix a race condition when building on MacLincoln Ramsay2011-03-071-4/+11
| * Harmattan: Adds missing static platform-config entries to harmattan_common.priSunil Thaha2011-03-071-0/+5
* | Update Qt Mobility Symbian installation instructionsKalle Juhani Lehtonen2011-03-075-0/+225
|/
* Harmattan: Resolved merge conflict in rules fileSunil Thaha2011-02-101-2/+2
|\
| * Fix the deployment of .pc files.Lincoln Ramsay2011-02-071-2/+2
* | Merge branch 'bluetooth-dev'Antti Luoma2011-02-012-37/+52
|\|
| * Fixed INCLUDEPATH problems for Mobility examples.Rohan McGovern2011-01-311-35/+44
| * Avoid accidental usage of system libraries.Rohan McGovern2011-01-311-2/+8
* | Add connectivity depnds on serviceframework to mobility.prf.templateAntti Luoma2011-02-011-0/+5
|/
* Merge remote branch 'origin/1.1' into master-from-1.1Rohan McGovern2011-01-214-3/+31
|\
| * Removed all patches from harmattaninstall/patchesKeith Isdale2011-01-174-3/+31
| * Specify that maemo6-landmarks needs to be enabled on meegoabcd2010-12-231-0/+5
* | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframewo...Qt Continuous Integration System2011-01-051-0/+14
|\ \
| * | fix pkgconfig generation once and for allAlex2010-12-231-0/+14
* | | landmarks plugin not correctly built for meegoabcd2010-12-241-0/+5
|/ /
* | Merge remote branch 'origin/1.1' into master-from-1.1Andrew Stanley-Jones2010-11-224-0/+12
|\|
| * add support for static configuration options (avoids config time checks)Alex2010-11-114-0/+12
* | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-connectivity i...Qt Continuous Integration System2010-11-102-1/+7
|\ \
| * \ Merge remote branch 'mobility/master'Andrew Stanley-Jones2010-11-041-1/+1
| |\ \
| * \ \ Merge branch 'bluetooth'Andrew Stanley-Jones2010-11-031-0/+1
| |\ \ \
| | * \ \ Merge remote branch 'origin/master' into connectivity/bluetoothAaron McCarthy2010-08-201-3/+4
| | |\ \ \
| | * \ \ \ Merge remote branch 'origin/master' into connectivity/bluetoothAaron McCarthy2010-08-043-4/+70
| | |\ \ \ \
| | * | | | | Import Bluetooth API.Aaron McCarthy2010-06-242-1/+7
| * | | | | | Merge remote branch 'origin/master' into connectivity/nfcAaron McCarthy2010-10-181-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote branch 'origin/master' into connectivity/nfcAaron McCarthy2010-09-302-5/+12
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'origin/master' into connectivity/nfcAaron McCarthy2010-09-091-2/+9
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote branch 'origin/master' into connectivity/nfcAaron McCarthy2010-08-201-3/+4
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge remote branch 'origin/master' into connectivity/nfcAaron McCarthy2010-07-303-4/+70
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Import NFC API.Aaron McCarthy2010-06-242-1/+6
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge remote branch 'origin/1.1' into master-from-1.1Andrew Stanley-Jones2010-11-104-9/+70
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Increase QtMobility version to 1.1.1Alex2010-11-081-1/+1
| * | | | | | | Fixes and additions to QtSF database generationTomi Vihria2010-11-054-9/+70
* | | | | | | | Merge remote branch 'origin/1.1' into master-from-1.1Rohan McGovern2010-10-261-1/+1
|\| | | | | | | | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | permit applications depending on QtMobility to override the deployment prerulesAlex2010-10-081-1/+1
| | |_|_|_|/ | |/| | | |
* / | | | | Bump QtMobility version to 1.2Alex2010-10-061-1/+1
|/ / / / /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-locationjuhvu2010-09-141-5/+0
|\ \ \ \ \
| * | | | | Remove QtTelephony Event APIWolfgang Beck2010-09-131-5/+0
| | |_|_|/ | |/| | |
* / | | | Moved Symbian Vendor info from examples.pri to basic_examples_setup.prijuhvu2010-09-141-0/+12
|/ / / /
* | | | Merge remote branch 'origin/master' into serviceframework-masterRohan McGovern2010-09-061-2/+2
|\ \ \ \
| * \ \ \ Merge branch '1.0'Kevin Wu Won2010-09-021-0/+3
| |\ \ \ \
* | | | | | fix include installtion for VresitOrganizerAlex2010-08-261-1/+1
* | | | | | Merge remote branch 'target/master' into serviceframework-masterRohan McGovern2010-08-251-2/+6
|\| | | | |
| * | | | | Separate out organizer parts of versit to a separate moduleKevin Wu Won2010-08-201-2/+6
| * | | | | merge latest changes to local branchPetteri Puolakka2010-08-132-4/+11
* | | | | | Merge branch '1.0'Christian Kamm2010-08-111-1/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Explicitly linking qtopiamail in mobility.prf is no longer necessary.Christian Kamm2010-07-271-1/+0
* | | | | | Merge remote branch 'mainline/master'Christian Kamm2010-08-112-6/+31
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | generate Qt convenience include headers for code under src/globalAlex2010-08-061-3/+4
| | |_|_|/ | |/| | |
| * | | | Remove use of deprecated single \ in .pro files.Aaron McCarthy2010-07-071-1/+1