summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* Update to new license formatSergio Ahumada2012-11-075-106/+111
| | | | | | | Also fixing some left overs from 8de152a9e1deb533070663cccf6a98e0d374b1d6 Change-Id: I28a91ca233dd835e6e53efbbd7ebd649461f5c04 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change copyrights from Nokia to DigiaSergio Ahumada2012-11-075-15/+10
| | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ie3b9224b2b6a32b417fa0b6643350d45046381e6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Recompile servicedbgen.exe against desktop Qt 4.8Aapo Haapanen2011-10-271-0/+0
| | | | | This is needed so that rom-installed serviceframework plugins work with Symbian Qt 4.8
* Make output of configure.bat more readableGareth Stockwell2011-10-121-7/+7
| | | | | | | | * Suppress output of failed SBSv2 instances to the console - they are available in config.log if required. * Remove unnecessary '...'s and 'OK's Reviewed-by: Alex
* Re-apply licenseheader text in source files for qtmobilityJyri Tahtela2011-06-305-86/+86
| | | | | | Fix license in files having old license. Reviewed-by: Trust Me
* remove accidentally committed bin/servicedbgen binaryAlex2011-03-151-0/+0
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-systeminfoAlex2011-03-151-0/+0
| | | | | | Conflicts: plugins/declarative/systeminfo/qdeclarativenetworkinfo.cpp plugins/declarative/systeminfo/qdeclarativenetworkinfo_p.h
* Add servicedbgenerator to bin folderKalle Juhani Lehtonen2011-03-113-0/+1
| | | | Change-Id: I2199e8f345215c6a6ef9e5b504235cb24dc994be
* Merge remote branch 'origin/1.1' into master-from-1.1Rohan McGovern2011-01-211-0/+4
|\ | | | | | | | | | | Conflicts: doc/src/examples.qdoc plugins/contacts/symbian/plugin/symbian_defines.pri
| * Don't generate convenience header for nested classesAlex2011-01-181-0/+4
| | | | | | | | For now we exclude any class which doesn't start with 'Q'.
* | Merge remote branch 'origin/1.1' into master-from-1.1Rohan McGovern2010-12-072-45/+41
|\| | | | | | | | | | | | | Conflicts: doc/src/examples/declarative-sfw-dialer.qdoc examples/declarative-sfw-dialer/declarative-sfw-dialer/qmldialer.cpp examples/declarative-sfw-notes/qmlnotes.cpp
| * Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts into ↵Qt Continuous Integration System2010-12-042-86/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.1-integration * '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts: Remove unused file. Remove empty file. Update the vCard example to have more contact data Allow vCard files to be commited using DOS line endings
| | * Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts into ↵Qt Continuous Integration System2010-12-032-86/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.1-integration * '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-contacts: Remove unused file. Remove empty file. Update the vCard example to have more contact data Allow vCard files to be commited using DOS line endings
| | | * Remove unused file.Toby Tomkins2010-12-031-46/+0
| | | |
| | | * Remove empty file.Toby Tomkins2010-12-031-40/+0
| | | |
| * | | Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/sensors into ↵Qt Continuous Integration System2010-12-031-0/+41
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | 1.1-integration * '1.1' of scm.dev.nokia.troll.no:qtmobility/sensors: Fix some more license headers. Fix various broken and missing license headers.
| * / move compilercheck script into /binAlex2010-12-031-0/+41
| |/ | | | | | | all scripts are in bin
* | Merge remote branch 'origin/1.1' into master-from-1.1Rohan McGovern2010-10-261-1/+1
|\|
| * Renames some class namesCharles Yin2010-10-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | QOrganizerEventTimeRange -> QOrganizerEventTime QOrganizerTodoTimeRange -> QOrganizerTodoTime QOrganizerJounalTimeInstant -> QOrganizerJounalTime QOrganizerItemManager -> QOrganizerManager QOrganizerItemManagerEngine -> QOrganizerManagerEngine QOrganizerItemAbstractRequest -> QOrganizerAbstractRequest QOrganizerItemRecurreneRule -> QOrganizerRecurrenceRule QOrganizerJournalTimeRange -> QOrganizerJournalTimeInstant
* | Merge branch '1.1' into ipcredesign branchAlex2010-09-301-1/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/sfwecho/sfwecho_service/main.cpp src/serviceframework/ipc/instancemanager.cpp src/serviceframework/ipc/ipc.pri src/serviceframework/ipc/objectendpoint.cpp src/serviceframework/ipc/qremoteserviceregister_dbus_p.cpp src/serviceframework/ipc/qremoteserviceregister_dbus_p.h src/serviceframework/ipc/qremoteserviceregister_p.cpp src/serviceframework/ipc/qremoteserviceregister_p.h src/serviceframework/ipc/qremoteserviceregister_s60.cpp src/serviceframework/ipc/qremoteserviceregister_s60_p.h src/serviceframework/qremoteservicecontrol.cpp src/serviceframework/qremoteservicecontrol.h src/serviceframework/qservicemanager.cpp tests/auto/qservicemanager_ipc/service/main.cpp
| * Added additional unit tests only to organizer in rununittests.shZsolt Simon2010-09-221-1/+8
| |
| * Revert "Updated rununittests to contain the new unit tests"Zsolt Simon2010-09-222-122/+12
| | | | | | | | This reverts commit 556d11099aee79545b734427761c0880d01ce24e.
| * Updated rununittests to contain the new unit testsZsolt Simon2010-09-222-12/+122
| | | | | | | | Added a few unit tests which were not included earlier in these files
* | remove QRemoteServiceClassRegisterAlex2010-09-032-2/+0
|/
* generate Qt convenience include headers for code under src/globalAlex2010-08-061-0/+1
|
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qtmobility/qtm-locationjuhvu2010-07-152-0/+23
|\ | | | | | | | | | | | | Conflicts: examples/examples.pro src/s60installs/s60installs.pro tests/auto/auto.pro
| * Revert "Revert "Merge branch 'master' of ../../mainline/qtmobility""David Laing2010-07-052-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e38ebf00c0b539a7756b21946693e201269b976a. Conflicts: examples/telephony/dialer/dialer.pro src/s60installs/bwins/QtMultimediaKitu.def src/s60installs/bwins/QtServiceFrameworku.def src/s60installs/bwins/QtSystemInfou.def src/s60installs/eabi/QtSystemInfou.def
* | Made changes to location QML binding after testing on Symbian device.juhvu2010-07-121-0/+1
|/ | | | Unit tests now pass on Symbian devices too.
* Revert "Merge branch 'master' of ../../mainline/qtmobility"David Laing2010-07-042-23/+0
| | | | | This reverts commit 448d4a4301b7abeb9065aca13b62c70422239b94, reversing changes made to 815d646dc485b6d15fbddc2814201a5b50be4a85.
* Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobilityChris Adams2010-06-302-0/+8
|\ | | | | | | | | | | | | | | Conflicts: doc/html/qt-mobility-project-library.dcf doc/html/qt-mobility-project-library.index doc/html/qtmobility.qhp plugins/plugins.pro
| * Merge branch 'master' of ../../mainline/qtmobilityDavid Laing2010-06-302-0/+10
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/html/classes.html doc/html/functions.html doc/html/qt-mobility-project-library.dcf doc/html/qt-mobility-project-library.index doc/html/qtmobility.qhp plugins/plugins.pro src/location/liblocationwrapper.cpp
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qtmobility/qtmobilityabcd2010-06-111-0/+59
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/html/annotated.html doc/html/classes.html doc/html/functions.html doc/html/hierarchy.html doc/html/location-overview.html doc/html/qt-mobility-project-library.dcf doc/html/qt-mobility-project-library.index doc/html/qtmobility.qhp examples/examples.pro src/global/qmobilityglobal.h
| * \ \ Merge branch 'master' of ../qtmobilityAlex2010-05-205-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/html/contactsengines.html doc/html/qt-mobility-project-library.index doc/html/qtmobility.qhp plugins/plugins.pro
| * \ \ \ Merge branch 'master' into 1.1-pluginsabcd2010-04-272-4/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/html/annotated.html doc/html/classes.html doc/html/fetchgooglemaps-mapwindow-h.html doc/html/functions.html doc/html/hierarchy.html doc/html/lightmaps-lightmaps-cpp.html doc/html/location-overview.html doc/html/qcontactaddress-members.html doc/html/qml-audio.html doc/html/qsystemnetworkinfo.html doc/html/qt-mobility-project-library.dcf doc/html/qt-mobility-project-library.index doc/html/qtmobility.qhp doc/src/snippets/snippets.pro features/mobility.prf.template src/location/liblocationwrapper.cpp src/location/liblocationwrapper.h src/location/location.pro src/location/qgeoareamonitor_maemo.cpp src/location/qgeoareamonitor_maemo_p.h src/location/qgeopositioninfosource_maemo5.cpp src/location/qgeosatelliteinfosource_maemo5.cpp
| * \ \ \ \ Merge branch 'master' of ../qtm-landmarks into 1.1Alex2010-02-262-0/+8
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of ../qtmobilityAlex2010-02-261-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure configure.bat doc/src/qtmobility.qdocconf features/mobility.prf.template
| | * | | | | | Preliminary implementation of qlandmark.hDavid Laing2010-02-092-0/+8
| | | | | | | |
* | | | | | | | Merge branch 'mastermerge' of scm.dev.nokia.troll.no:qtmobility/qtm-contactsChris Adams2010-06-292-0/+10
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.bat examples/examples.pro plugins/declarative/declarative.pro
| * | | | | | | Merge branch 'master' into ipcAlex2010-06-166-5/+64
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/html/annotated.html doc/html/classes.html doc/html/functions.html doc/html/qservicefilter.html doc/html/qserviceinterfacedescriptor.html src/serviceframework/qservicemanager.cpp
| * | | | | | | Merge branch 'master' into ipcAlex2010-06-031-1/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/html/annotated.html doc/html/audiorecorder-audiorecorder-cpp.html doc/html/bearermonitor-sessionwidget-h.html doc/html/classes.html doc/html/contacts.html doc/html/contactsusagehtml.html doc/html/declarative.html doc/html/functions.html doc/html/gpl.html doc/html/licenses-fonts.html doc/html/licenses.html doc/html/licensing.html doc/html/linereader-members.html doc/html/qcontact-members.html doc/html/qcontact.html doc/html/qcontactabstractrequest.html doc/html/qcontactaction-members.html doc/html/qcontactaction.html doc/html/qcontactactiondescriptor-members.html doc/html/qcontactactiondescriptor.html doc/html/qcontactactionfactory-members.html doc/html/qcontactactionfactory.html doc/html/qcontactactionfilter-members.html doc/html/qcontactactionfilter.html doc/html/qcontactaddress-members.html doc/html/qcontactaddress.html doc/html/qcontactanniversary-members.html doc/html/qcontactanniversary.html doc/html/qcontactavatar-members.html doc/html/qcontactavatar.html doc/html/qcontactbirthday-members.html doc/html/qcontactbirthday.html doc/html/qcontactdetail-members.html doc/html/qcontactdetail.html doc/html/qcontactdetaildefinitionfetchrequest-members.html doc/html/qcontactdetaildefinitionfetchrequest.html doc/html/qcontactdetaildefinitionremoverequest-members.html doc/html/qcontactdetaildefinitionremoverequest.html doc/html/qcontactdetaildefinitionsaverequest-members.html doc/html/qcontactdetaildefinitionsaverequest.html doc/html/qcontactdisplaylabel-members.html doc/html/qcontactdisplaylabel.html doc/html/qcontactemailaddress-members.html doc/html/qcontactemailaddress.html doc/html/qcontactfamily-members.html doc/html/qcontactfamily.html doc/html/qcontactfetchhint.html doc/html/qcontactfetchrequest-members.html doc/html/qcontactfetchrequest.html doc/html/qcontactgender-members.html doc/html/qcontactgender.html doc/html/qcontactgeolocation-members.html doc/html/qcontactgeolocation.html doc/html/qcontactglobalpresence-members.html doc/html/qcontactglobalpresence.html doc/html/qcontactguid-members.html doc/html/qcontactguid.html doc/html/qcontactinvalidengine-members.html doc/html/qcontactlocalidfetchrequest-members.html doc/html/qcontactlocalidfetchrequest.html doc/html/qcontactmanagerengine.html doc/html/qcontactmemoryengine-members.html doc/html/qcontactname-members.html doc/html/qcontactname.html doc/html/qcontactnickname-members.html doc/html/qcontactnickname.html doc/html/qcontactnote-members.html doc/html/qcontactnote.html doc/html/qcontactonlineaccount-members.html doc/html/qcontactonlineaccount.html doc/html/qcontactorganization-members.html doc/html/qcontactorganization.html doc/html/qcontactphonenumber-members.html doc/html/qcontactphonenumber.html doc/html/qcontactpresence-members.html doc/html/qcontactpresence.html doc/html/qcontactrelationship.html doc/html/qcontactrelationshipfetchrequest-members.html doc/html/qcontactrelationshipfetchrequest.html doc/html/qcontactrelationshipremoverequest-members.html doc/html/qcontactrelationshipremoverequest.html doc/html/qcontactrelationshipsaverequest-members.html doc/html/qcontactrelationshipsaverequest.html doc/html/qcontactremoverequest-members.html doc/html/qcontactremoverequest.html doc/html/qcontactringtone-members.html doc/html/qcontactringtone.html doc/html/qcontactsaverequest-members.html doc/html/qcontactsaverequest.html doc/html/qcontactsynctarget-members.html doc/html/qcontactsynctarget.html doc/html/qcontacttag-members.html doc/html/qcontacttag.html doc/html/qcontactthumbnail-members.html doc/html/qcontactthumbnail.html doc/html/qcontacttimestamp-members.html doc/html/qcontacttimestamp.html doc/html/qcontacttype-members.html doc/html/qcontacttype.html doc/html/qcontacturl-members.html doc/html/qcontacturl.html doc/html/qremoteserviceclassregister-members.html doc/html/qservicefilter.html doc/html/qserviceinterfacedescriptor.html doc/html/qt-mobility-project-library.dcf doc/html/qt-mobility-project-library.index doc/html/qtmedia.html doc/html/qtmobility.qhp doc/html/samplephonebook-contacteditor-cpp.html doc/html/samplephonebook-contactlistpage-cpp.html doc/html/samplephonebook-phonebook-cpp.html doc/html/sensors-api.html doc/html/serviceactions-mainwindow-cpp.html doc/html/serviceactions.html doc/html/sfw-notes.html doc/html/versit.html
| * | | | | | | add new unit tests to test scriptAlex2010-04-202-0/+10
| | | | | | | |
* | | | | | | | Merge branch 'master' of ../qtm-contactsKevin Wu Won2010-06-171-0/+59
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure configure.bat examples/examples.pro qtmobility.pro src/global/qmobilityglobal.h
| * | | | | | | fix -prefix handling by configure sehell scriptAlex2010-05-241-0/+59
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.) avoid unintentional removal of existing directories 2.) handle error case of Maemo5 prefix 3.) permit ./configure without having write permission for final install path Task-number: QTMOBILITY-50 QTMOBILITY-264 MOBILITY-971
* | | | | | | Implemented logic in memory engine to fix Occurrences on saveKevin Wu Won2010-06-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the importer imports items, it cannot set the parentLocalId() on Occurrences properly to refer to the parent event. This responsibility is therefore that of the engine - to check the Guid and the ParentLocalId on Occurrence types on item save and ensure they are consistent. This is such an implementation for the memory engine.
* | | | | | | Added tst_QVersitOrganizer{Im,Ex}porter to rununittests.shKevin Wu Won2010-06-041-0/+2
|/ / / / / /
* | / / / / Bump copyright date from 2009 to 2010dac2010-05-075-5/+5
| |/ / / / |/| | | |
* | | | | Unit tests for QContactManagerEngine::compatibleContact()Kevin Wu Won2010-04-091-1/+0
|/ / / / | | | | | | | | | | | | Relates to QTMOBILITY-92
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qtmobility/qtmobilityJustin McPherson2010-03-191-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtMediau.def
| * | | | Merge commit 'origin/master' into maemo5-dJaakko Vuori2010-03-162-2/+10
| |\| | |
| * | | | qvaluespaceprovider is now qvaluespacepublisherJaakko Vuori2010-03-161-1/+1
| | |_|/ | |/| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 21:21:01 +0000