summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mobility/master' into master-from-1.1Andrew Stanley-Jones2011-04-20316-1181/+1635
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframewo...Qt Continuous Integration System2011-04-20297-1627/+2043
| |\
| | * Put the appropriate license here.Michael Goddard2011-04-191-0/+27
| | * make compileAlex2011-04-183-12/+12
| | * Merge branch 'master' of ../qtmobilityAlex2011-04-1895-2351/+3617
| | |\
| | * | Docs: QTMOBILITY-790 added since tag to 1.2 classes.Peter Yard2011-04-1563-19/+112
| | * | Docs: QTMOBILITY-790 added since tag for 1.1 Classes.Peter Yard2011-04-15107-595/+704
| | * | Docs: added since version to 1.0 classes. QTMOBILITY-790Peter Yard2011-04-15125-1014/+1164
| | * | Fix symbian problems with waiting on Active ObjectsAndrew Stanley-Jones2011-04-141-8/+2
| | * | Docs: QTMOBILITY-1465. Add namespace qdoc file for Audio.Peter Yard2011-04-141-0/+43
| | * | Merge branch 'master' of ../qtmobilityAlex2011-04-13165-4277/+7012
| | |\ \
| | * | | Docs: QTMOBILITY-1465 QAudio namespace link problem.Peter Yard2011-04-121-4/+4
| * | | | Merge branch 'master-stable' of scm.dev.nokia.troll.no:qtmobility/qtm-connect...Qt Continuous Integration System2011-04-2021-61/+89
| |\ \ \ \
| | * | | | Fix device discovery in Symbian Bluetooth backendFranck Maillot2011-04-191-12/+34
| | * | | | Fix Aaron's commit 1d1bedbd3d8 I thinkAndrew Stanley-Jones2011-04-191-4/+4
| | * | | | Fix bluetooth enums that didn't match bluetooth specAndrew Stanley-Jones2011-04-191-5/+5
| | * | | | Fix static analysis errors.Aaron McCarthy2011-04-1517-36/+37
| | * | | | Disable debug messages in Symbian NFC.Aaron McCarthy2011-04-152-8/+13
| | * | | | Merge remote branch 'mobility/master'Andrew Stanley-Jones2011-04-1455-210/+531
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts into ...Qt Continuous Integration System2011-04-191-0/+6
| |\ \ \ \ \ \
| | * | | | | | Set the EmptyContactError if needed.Xizhi Zhu2011-04-181-0/+6
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia int...Qt Continuous Integration System2011-04-181-0/+1
| |\ \ \ \ \ \
| | * | | | | | Camerabin backend: added captureMode changes notifications.Dmytro Poplavskiy2011-04-181-0/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ...Qt Continuous Integration System2011-04-182-14/+12
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Attempt to make a workaround for QTMOBILITY-1535.juhvu2011-04-182-14/+12
* | | | | | | Merge branch 'master' of ../qtmobility into master-from-1.1Alex2011-04-182-0/+38
|\| | | | | |
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfo int...Qt Continuous Integration System2011-04-161-0/+37
| |\ \ \ \ \ \
| | * | | | | | added traces for debuggingLeela Prasanna Kumar Chintagunta2011-04-151-0/+37
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/sensors into maste...Qt Continuous Integration System2011-04-151-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | added irproxy testp2niemel2011-04-081-0/+1
* | | | | | | | | Merge branch '1.1' of ../qtmobility into master-from-1.1Alex2011-04-151-8/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix symbian problems with waiting on Active ObjectsAndrew Stanley-Jones2011-04-151-8/+2
* | | | | | | | | | Merge branch 'master' of ../qtmobility into master-from-1.1Alex2011-04-1541-1438/+1814
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'master-stable' of scm.dev.nokia.troll.no:qtmobility/qtm-connect...Qt Continuous Integration System2011-04-1541-1438/+1814
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Update def filesAndrew Stanley-Jones2011-04-142-861/+849
| | * | | | | | | | wrong implementation of private slots in Symbian backendFranck Maillot2011-04-149-62/+64
| | * | | | | | | | Def file updateAndrew Stanley-Jones2011-04-142-637/+639
| | * | | | | | | | Include declarative related symbols even when building against Qt 4.6.Aaron McCarthy2011-04-141-10/+4
| | * | | | | | | | Fix double free on Symbian after touching Mifare tag.Aaron McCarthy2011-04-141-1/+0
| | * | | | | | | | Return a RequestId from NDEF read/write functions.Aaron McCarthy2011-04-1422-100/+203
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-connectivitySean Fang2011-04-141-2/+0
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix merge error from symbian backendAndrew Stanley-Jones2011-04-141-2/+0
| | * | | | | | | | | Fix for http://bugreports.qt.nokia.com/browse/QTMOBILITY-1522Sean Fang2011-04-131-0/+1
| | |/ / / / / / / /
| | * | | | | | | | Fix symbian backend changes breaking bluezAndrew Stanley-Jones2011-04-132-8/+9
| | * | | | | | | | tst_qbluetoothdevicediscoveryagent fix for symbianJaakko Lipasti2011-04-135-66/+148
| | * | | | | | | | Symbian bluetooth socket implementation improvementFranck Maillot2011-04-1311-369/+574
| | * | | | | | | | Bluetooth Symbian service discovery fails when only 1 device providedFranck Maillot2011-04-131-3/+4
* | | | | | | | | | Merge branch 'master' of ../qtmobility into master-from-1.1Alex2011-04-1528-772/+1471
|\| | | | | | | | |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-location into ...Qt Continuous Integration System2011-04-151-0/+5
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'master' of ../mainline-repoDavid Laing2011-04-1440-122/+386
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |