| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
| |
This is a backport of QtSensors commit
ceec1eda82dd9b6f8823bb7f9639e6f79763331e
Change-Id: I3e5d8bc99d9f14163c45593e216d21e2f972999d
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
|
| |
|
|
|
|
| |
Change-Id: I96513e8b6f09e76998a18edb5411ae06f52cba7c
Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* Not all C++ compilers inject C functions into global namespace,
On QNX you need to use std:: when using functions from <cstdlib>
for example.
* Disable a few modules that don't compile.
* QNX linker doesn't like -rdynamic.
* Explicitly link against network, sql and declarative modules
since QNX's linker doesn't pull in indirect dependencies.
* Don't build against gstreamer on QNX.
Change-Id: Ic3a202fbbbb77b25334323681e7dbf8bd5872f59
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
| |
|
|
|
|
|
| |
Also fixing some left overs from 8de152a9e1deb533070663cccf6a98e0d374b1d6
Change-Id: I28a91ca233dd835e6e53efbbd7ebd649461f5c04
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
|
|
|
|
|
| |
Change copyrights and license headers from Nokia to Digia
Change-Id: Ie3b9224b2b6a32b417fa0b6643350d45046381e6
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
| |
|
|
|
|
| |
Fix license in files having old license.
Reviewed-by: Trust Me
|
| | |
|
| | |
|
| | |
|
| |
|
|
| |
feedbackfile effects
|
| |\
| |
| |
| |
| |
| |
| |
| |
| | |
scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework into master-integration
* 'master' of scm.dev.nokia.troll.no:qtmobility/qtm-serviceframework:
Docs: updates to location qml. Example images.
Docs: updates to Multimedia QML plugin doc.
Docs: QTMOBILITY-1449 symbian.org links replaced with valid ones.
|
| | |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/examples/quickstart.qdoc
plugins/declarative/multimedia/qdeclarativecamera.cpp
|
| | | | |
|
| | |/
|/|
| |
| |
| |
| |
| |
| | |
Depending on the record type specifications a record with an empty
payload might not be a valid record. For example the Text record has a
minium size of 1 byte (the status byte), the locale and text may be of
zero size as specified by the status byte and the payload length. Uri
records also have a 1 byte minium size (the uri prefix).
|
| |\|
| |
| |
| |
| | |
Conflicts:
tests/location-testing-tools/mapviewer/mapviewer.pro
|
| | | |
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/snippets/snippets.pro
examples/sensors/reading_perf/reading_perf.pro
examples/sensors/test_manual/test_manual.pro
plugins/multimedia/symbian/mmf/mediaplayer/mediaplayer_s60.pri
tests/location-testing-tools/geoservicedemo/geoservicedemo.pro
tests/location-testing-tools/mapviewer/mapviewer.pro
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
So that:
a) it compiles
b) it gets c++ style checked
c) it can be made more consistent
Task-number: QTMOBILITY-1328
Reviewed-by: Jonas Rabbe
Change-Id: Ifdd8d9c41dc375b04c601585470daadb21887758
|
| | | |
|
| |\ \ |
|
| | | | |
|
| |\| | |
|
| | | | |
|
| |/ /
| |
| |
| | |
Task-number:QTMOBILITY-1232
|
| | | |
|
| | | |
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/examples/declarative-sfw-dialer.qdoc
examples/declarative-sfw-dialer/declarative-sfw-dialer/qmldialer.cpp
examples/declarative-sfw-notes/qmlnotes.cpp
|
| | | |
|
| |\| |
|
| | | |
|
| | | |
|
| |\|
| |
| |
| |
| |
| | |
Conflicts:
doc/src/qtmobility.qdocconf
tests/auto/auto.pro
|
| | |
| |
| |
| | |
Task-number: MOBILITY-1827
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Completely restructured the main page for organizer qdocs to put in code snippets
Removed the API Usage page and replaced with an Advanced API Usage page
Fixed:
* TimeSpecified -> AllDay
* Fix description of the new item getter functions
* QOrganizerItemManager -> QOrganizerManager
* Add Collections documentation
Various fixes for class documentation
Relates to MOBILITY-1798
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
1.1-integration
* '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-calendar:
tst_QOrganizerManager::idComparison() test requires features that not all backends support
Symbian: Fixed a bug in item id serialization
Symbian: Fixed filter/sort unit test module
Symbian: Fixed tst_recurringitems test
Fix reminder type checking and isEmpty checking
Expand unit test for importing iCalendar RRULEs
Ensure that less-than comparison is stable for item and collection ids
Unit test for function QOrganizerManagerEngine::testFilter
Add unit test to verify item and collection id comparison semantics
Fix various problems in the organizer module documentation
Add test for QVersitContactHandler plugins
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Relates to task MOBILITY-1763.
Reviewed By: Michael Goddard
|
| | |/ |
|
| | | |
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
1.1-integration
* '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-vibra:
Cache the plugin paths so we don't walk the filesystem every time.
Restore some of the old plugin directory checking code.
Try and load the effect once something is selected.
Update .def files for feedback.
Fix a build error - forgot to update all users of an enum.
Create a wrapper for QFeedbackEffect so we can rename the enums.
Change the filename property to a URL.
Remove extraneous stuff from doc line.
Use more elaborate enum value.
Add a wrapper for feedback theme effects.
Add the QML files to the .pro file as OTHER_FILES
Update header.
This file is not needed here - quite out of date.
|
| | | |
| | |
| | |
| | | |
API review suggested this.
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
plugins/organizer/maemo5/qorganizerasynchprocess.cpp
plugins/organizer/maemo5/qorganizermaemo5.cpp
plugins/organizer/maemo5/qorganizermaemo5_p.h
plugins/organizer/skeleton/qorganizerskeleton.cpp
plugins/organizer/skeleton/qorganizerskeleton_p.h
plugins/organizer/symbian/organizeritemrequestserviceprovider.cpp
plugins/organizer/symbian/qorganizersymbian_p.h
plugins/organizer/symbian/transform/organizereventtimerangetransform.cpp
plugins/organizer/symbian/transform/organizertodotimerangetransform.cpp
plugins/organizer/symbian/tsrc/tst_itemoccurrence/tst_itemoccurrence.cpp
src/organizer/details/qorganizeritemdetails.cpp
src/organizer/engines/qorganizeritemmemorybackend.cpp
src/organizer/engines/qorganizeritemmemorybackend_p.h
src/organizer/items/qorganizerevent.cpp
src/organizer/items/qorganizerevent.h
src/organizer/items/qorganizertodo.h
src/organizer/qorganizermanager.cpp
src/organizer/qorganizermanagerengine.cpp
src/organizer/qorganizermanagerengine.h
src/organizer/qorganizermanagerenginefactory.cpp
src/organizer/qorganizerrecurrencerule.cpp
src/organizer/requests/qorganizeritemoccurrencefetchrequest.cpp
src/organizer/requests/qorganizeritemoccurrencefetchrequest.h
src/organizer/requests/qorganizeritemrequests_p.h
|
| | | |/
| | |
| | |
| | |
| | | |
Also, fix remaining usages of InstanceOrigin to be Parent.
Rename QOrganizerItemInstanceFetchRequest to OccurrenceFetchRequest.
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QOrganizerEventTimeRange -> QOrganizerEventTime
QOrganizerTodoTimeRange -> QOrganizerTodoTime
QOrganizerJounalTimeInstant -> QOrganizerJounalTime
QOrganizerItemManager -> QOrganizerManager
QOrganizerItemManagerEngine -> QOrganizerManagerEngine
QOrganizerItemAbstractRequest -> QOrganizerAbstractRequest
QOrganizerItemRecurreneRule -> QOrganizerRecurrenceRule
QOrganizerJournalTimeRange -> QOrganizerJournalTimeInstant
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
organizer1.1
Conflicts:
src/s60installs/bwins/QtContactsu.def
src/s60installs/bwins/QtOrganizeru.def
src/s60installs/bwins/QtVersitOrganizeru.def
src/s60installs/bwins/QtVersitu.def
src/s60installs/eabi/QtContactsu.def
src/s60installs/eabi/QtOrganizeru.def
src/s60installs/eabi/QtVersitOrganizeru.def
src/s60installs/eabi/QtVersitu.def
|
| | | | |
|
| | | | |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/organizer/engines/qorganizeritemmemorybackend.cpp
src/organizer/engines/qorganizeritemmemorybackend_p.h
src/s60installs/eabi/QtOrganizeru.def
|
| | | |\ \ |
|