summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix unit test failuresMatt Vogt2015-04-167-35/+67
| | | | | | | | | | | | | | | | | | | Includes the following changes: - QDeclarativeContactExtendedDetail::setData now unboxes values from QJSValue - QDeclarativeOrganizerItemExtendedDetail::setData now unboxes values from QJSValue - QDeclarativeOrganizerRecurrenceRule is now reset when assigned a null void * - Correct tst_QVersitContactExporter logic, since QVariantHash is now a supported type for QJsonValue export - Correct tst_QVersitOrganizerExporter logic, since QVariantHash is now a supported type for QJsonValue export - Correct expected output when compring debug output involving QVariant data Change-Id: I67b6b71226c4b4c928c0c26681b24813de525545 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* More license test fixesAlex Blasche2015-04-16675-705/+675
| | | | | | | | | This change should have really been part of I4a4c08123be144a0f3c2c9ce987f5ce1e9ff8bb4 but resolving the conflicts across 300+ files is no fun. Change-Id: Ic14b52c6e27c1924419446b7f876954dc7bf1450 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
* Make tests compile even when serviceframework was builtAlex Blasche2015-04-161-4/+6
| | | | | Change-Id: I6acf22c6a4e7624e45f01aafb1450bfd72669098 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Update contact URLAlex Blasche2015-04-16676-676/+676
| | | | | | | QtProject is no more. Change-Id: I2b1d6ff8ed40deec419c51757a539b40cc78b42f Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
* Project files do not have a license headerAlex Blasche2015-04-164-146/+0
| | | | | Change-Id: I47a0d1af400a80497f414c1f32dee29a36fa0ff1 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
* Fix licenses for QtPIMAlex Blasche2015-04-16676-13318/+8666
| | | | | | | | | | 1.) Use QtCompany in each header and update copyright year 2.) All tests are LGPLv21 (some test files were BSD) 3.) Convert doc snippet to BSD (some were LGPL) 4,) Convert example code from FDL to BSD Change-Id: I4a4c08123be144a0f3c2c9ce987f5ce1e9ff8bb4 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
* Update license files for qtpim repoAlex Blasche2015-04-164-685/+476
| | | | | Change-Id: If0db05ccc420e58f33283d382f11dd9a66a36679 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
* Remove stable branch from qtpim/dev sync.profileAlex Blasche2015-04-161-3/+3
| | | | | | | The stable branches are no longer. Change-Id: I45654b499409f3b1f5892d3b3287163817a3bef6 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Replace defaultCollection() with defaultCollectionId()Konstantin Ritt2015-02-1230-93/+74
| | | | | | | | | | | This assumes the id of a default collection is known at the engine initialization time, but makes it possible to defer fetching the default collection's content up until it is needed. This also greatly simplifies the initialization process for the async-only engines. Change-Id: I5116ffdd22d7fa6cc5f8a8eed7f94518e6db7089 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Do not mention QtOrganizer in QtContacts moduleKonstantin Ritt2015-02-1218-25/+25
| | | | | | | A fixup for 86aa56275c33be673f60f3c2b51d4f719de9315c Change-Id: Ife24e013231b81c11437d3a1268d1b6de4be93fd Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
* Fix build with Qt 5.5 (current dev)Konstantin Ritt2015-02-121-0/+1
| | | | | Change-Id: I56ce29162b13af56f06e11065748532de9e35dd0 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
* Add QContactCollection.Renato Araujo Oliveira Filho2015-02-0655-23/+4940
| | | | | | | | | The QContactCollection class represents a collection of contacts in a manager. This class was implemented based on QOrganizerCollection. Change-Id: I5377f9043a66726182b7a0ed7f40733ffe08b619 Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Add missing qmetatype.h include to qorganizerrecurrencerule.hDmitry Shachnev2015-01-131-0/+1
| | | | | | | That header is needed because we use Q_DECLARE_METATYPE macro. Change-Id: I3a9fc388d6793f047783e752e6750483d75b8277 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* Make ID component parameter escaping functions consistentMatt Vogt2015-01-052-16/+28
| | | | | | | | Use the same coding style when escaping and unescaping characters in both the URI and the local ID components. Change-Id: I690c3d840368a7795e7fe092910255960cbacdde Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* PIM ID local components do not need to be human-readableMatt Vogt2015-01-0527-213/+461
| | | | | | | | | | | | | The PIM ID objects compose two elements: the URI of the manager that owns them, and a local component meaningful only to that manager. The URI is composed from human-readable elements and benefits from a string representation, but the local element has no requirement on readability, and can consume less storage by using a binary representation. Change-Id: I56d553f6d9debf0486310688006b0be8728c1c90 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Fix build: error: ‘guard’ was not declared in this scopeZhang Xingtao2014-12-282-0/+80
| | | | | Change-Id: If2334079e4494d60bec1b616102175f531343bd9 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Remove unnecessary \inqmlmodule parameterAlejandro Exojo2014-12-0816-89/+89
| | | | | Change-Id: Ib9207074048c0368977f5e3db276f1ec8c7d2eaf Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* Avoid update contact model if it is marked as autoUpdate false.Renato Araujo Oliveira Filho2014-11-201-1/+1
| | | | | | | | | Does not update declarative contact model when the manager change if the property autoUpdate is marked as false. Change-Id: Ib6fa1ab3dcf127ab6c3ffa9a4c8dbfa91354e35b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Fixed contact import into QDeclarativeContactModel.Renato Araujo Oliveira Filho2014-11-201-0/+77
| | | | | | | | Create a ContactExporterResourceHandler which store the contact binary data into a temporary file while converting to QContact. Change-Id: Ia532f43a08e871efb290c675c81dc03b09c96658 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Added list of imported ids as argument for importItems.Renato Araujo Oliveira Filho2014-08-266-13/+67
| | | | | | | The ids can be used to know which items was successful imported/inserted into the model. Change-Id: I3fd66377d53844dfd8ad377304893c7f3413ad1a Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Cache deserialized manager URIs to promote data sharingMatt Vogt2014-08-084-2/+40
| | | | | | | | | | When deserializing ID objects, construct the resulting objects from cached instances of the manager URI string so that the resulting ID objects can share a string data representation. Change-Id: If3091bfc42e61938a823a9d2bfc68d0dafec0977 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Unify semantics of ID classesMatt Vogt2014-08-0610-25/+130
| | | | | | | | | | | | | | For each of QContactId, QOrganizerItemId and QOrganizerCollectionId the following are true: - null values compare less-than non-null values - null values compare equal - null values convert to empty string representation This changes also removes the distinction between non-valid and null QContactId values. Change-Id: I6d343728873a49a4dfba0109110980c36eb91b90 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* [versit] SubTypeLandline does not imply TEL;TYPE=ISDNMatt Vogt2014-08-058-17/+34
| | | | | | | | | | | | | The Landline sub type of QContactPhoneNumber should not be exported as ISDN, as this is a more specific annotation. Instead, export Landline simply as TYPE=VOICE. A new sub type value is defined for importing TEL records that claim ISDN type. Change-Id: Id5afc25597527f4e36dbb23897dce508876642a0 Reviewed-by: Renato Araujo Oliveira Filho <renato.filho@canonical.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Cache managerUri value to promote string data sharingMatt Vogt2014-08-012-2/+6
| | | | | | | | | Allow the various instances of string objects containing manager URIs to be shared, by returning a fixed instance from which they can be copied. Change-Id: Id2522c35a1aa009667348a61409cfd87837be9cf Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Simplify contact and organizer ID representationsKonstantin Ritt2014-08-0154-2632/+692
| | | | | | | | | | Simplify contact and organizer IDs to simply contain a manager URI that identifies the owner of the identified object, and an engine- specific string that identifies the object to that manager. Change-Id: Ic14c419df264e91c61e0f3d474d846289e1aaa82 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Extend changed signals to optionally report changed typesMatt Vogt2014-07-1829-129/+354
| | | | | | | | | | | | Add a parameter to the contactsChanged and itemsChanged signals, which allow a manager to optionally report the extent of changes involved in a contact or organizer item modification. If no changes are explicitly reported by the manager, the receiver must assume that any or all details of the contacts or organizer items may have been modified. Change-Id: Ie8a0d051c3f82a5911dea68213d78c2b173e762e Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* [versit] Ensure VCARD output is deterministicMatt Vogt2014-07-168-20/+39
| | | | | | | | | | | | | | Sort the parameters emitted by the VCARD writers so ensure that the results are deterministic for testing purposes. The specification does not constrain ordering, so this change is required only to make the test code simple and robust. Also sort some QDebug output values for the same reason. Task-number: QTBUG-25382 Change-Id: Ifcebc4c13fc1c3b6cb963235c55b83cee1a65571 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Get rid of StorageLocations conceptKonstantin Ritt2014-07-1321-499/+14
| | | | | | | | | | | | | The StorageLocations concept was introduced to support a feature of the qtjsondb backends, which were never released and have now been removed. The concept is no longer desired, as the semantics are unclear and no existing backend provides the feature. Change-Id: I4b1826c8e9562bc4e6c8d93935909b8b8089f29f Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Revert change to QContactRelationship participant typesMatt Vogt2014-07-0929-313/+326
| | | | | | | | | | | | | | A earlier change converted QContactRelationship first and second properties to use QContact rather than QContactId representations. The motivation for this change is unclear, but it resulted in undesirable complication to the interface without obvious benefits. This change restores the original ID-based representation for relationships. Change-Id: Iaeff907d11efcda0ef3ba3161ee0c3e760b0dd1a Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fixed DisplayName conversion to vcard.Renato Araujo Oliveira Filho2014-07-012-5/+3
| | | | | | | | | | | | | Based on VCARD spec "FN" field is only one string, the old implementation store a string list and does not change the property type, that causes the following error: Variant value is a QStringList but the property's value type is neither CompoundType or ListType Changing the property to store a single string fixes the problem. Change-Id: I7a7857fb2c498518d7940410d0bb65558e230fec Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Add QContactType::TypeFacet valueMatt Vogt2014-06-248-4/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow a contacts backend to provide explicit support for composition of contact representations into a single composite contact. A single logical contact can be represented in a QtContacts system as multiple separate elements, each created and maintained by separate software systems. To support this use-case, provide the 'Facet' contact type, which has the same structure as a TypeContact contact, but different semantics. A facet is defined as the portion of an individual contact known by any one system, which is probably incomplete. For example, an email service will be able to know the name and email address of a contact from message metadata, but has no access to phone numbers or mailing addresses. By storing contact details as facets, it explicitly allows them to be aggregated into more comprehensive contact representations. Facet contacts are made available to clients as regular contacts by producing contacts of type TypeContact, which aggregate the details of the facets together into a composite whole. The correspondence between facets and their composing contacts is defined by QContactRelationship records with type 'Aggregates'. The semantics governing the behavior of facets and composite contacts when modified or deleted are left to be defined by each backend that implements the Facet type. Change-Id: I486e2d9140fca5d306dc56fb5de9bb6ca2327686 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix organizer tests in outlying timezonesMatt Vogt2014-06-244-383/+499
| | | | | | | | | | Fix test failures resulting from incorrect handling of local and UTC time, which fail only in timezones some distance from UTC. Change-Id: I8ddecf501a4db46aca07a1e5d5db7dc5eb804b78 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Remove jsondb backendsMatt Vogt2014-06-16114-19191/+210
| | | | | | | The jsondb contact and organizer backends are unsupported. Change-Id: I6aa76c94b97edad20d43d777f75ec66f0400b65e Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Add the qmlcontacts test back to the set of auto testsMatt Vogt2014-06-0524-103/+184
| | | | | | | | | | | | | | The qmlcontacts test was previously removed from the set of executed auto tests. This change adds it back to the executed list. Skip jsondb-dependent tests if the jsondb components cannot be loaded, and update some of the tests to do something sane. Some particularly odd cases are now marked with expectFail, as I have no idea why they might have ever been expected to pass. Change-Id: I391edcecb93e0ad50122e9adbf6a6af6da8c0ec7 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Improve Q*Id autotests a bitKonstantin Ritt2014-05-164-93/+56
| | | | | | Change-Id: Ib679d291c62e85e85b1887e31d642deef70e31c2 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Centralize the URI and the ID string parse/build codeKonstantin Ritt2014-05-1613-467/+342
| | | | | | | | | This also reduces the code duplication and consolidates the behavior between QtContacts and QtOrganizer. Change-Id: Ia2df252e6b55652821df143c1421b326bfbc3c7f Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Avoid create a new contact engine model if the current one is equal.Renato Araujo Oliveira Filho2014-05-141-0/+3
| | | | | | | | Check for engine name and manager-uri before recreate the contact engine. Change-Id: I933cc9e6d67f39e69d76f46cc92a9b7b5853707f Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fixed memory leak on QDeclarativeContactModel private data.Renato Araujo Oliveira Filho2014-05-142-1/+6
| | | | | | | | Changed QDeclarativeContactModel private data from pointer to QScopedPointer. Change-Id: I07d0aa0f40cc4a592e0f44bde81c8dca8a797f9e Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Decrease code duplicationKonstantin Ritt2014-05-144-76/+57
| | | | | | | | Make isInactive(), isActive(), isCanceled(), and isFinished() a simple convenience accessors to state(), like they ought to be. Change-Id: Idd72ed7bda9041b8d58095f2813a78a012c4ce2e Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Correct expected results when using ICUMatt Vogt2014-05-132-5/+33
| | | | | | | ICU produces different collation results than strcoll. Change-Id: Ib0f87deefb5c2efe8ab57a895189788e86f1ebd1 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Make the qcontactmanagerfiltering test passMatt Vogt2014-05-134-1157/+871
| | | | | | | | | Update to account for some QtContacts/QtPIM discrepancies. Also, force the test to run in the C locale, so that locale-dependent tests have consistent behavior. Change-Id: Ibbb5c786088d88ace1cb5add4565783a9df4d6e2 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Fix the generic implementation of relationship filteringMatt Vogt2014-05-131-4/+10
| | | | | Change-Id: I86de6318a5a09f28720662be364be3243baa5c77 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Remove dependency on jsondb for generic testsMatt Vogt2014-05-136-15/+28
| | | | | | | | The tests for qcontactmanager and qcontactmanagerdetails do not require jsondb. Change-Id: Ib5d814fec7abc699b2664e51fba60ef6031bb149 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Remove the 'local' text from the IdFilter descriptionMatt Vogt2014-05-131-1/+1
| | | | | | | | This change was missed in the conversion from QContactLocalIdFilter to QContactIdFilter. Change-Id: I8ad6e434e463b8996ddd5362c3bf8a0f20e3a916 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Export QDeclarativeContactInvalidFilter and ↵Renato Araujo Oliveira Filho2014-05-124-0/+5
| | | | | | | | | | QDeclarativeOrganizerItemInvalidFilter to QML. This filter can be used to clear the contact/organizer model. Change-Id: Ie4b831dd353556e9ab6816a7a708348fb10e9b27 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* [ContactModel] Make better use of shared filter and fetchHintKonstantin Ritt2014-05-091-8/+8
| | | | | Change-Id: Icad104410c353bc70a1a9ea37386910d147750ac Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* [OrganizerModel] Don't delete fetchHint we don't ownKonstantin Ritt2014-05-092-7/+9
| | | | | | | Do generally what we're doing for m_filter. Change-Id: I12c54eae27b342b01cd16a6aea714664bde62694 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* [OrganizerModel] Don't track the inactive filterKonstantin Ritt2014-05-091-1/+3
| | | | | Change-Id: If36d05f4c2e729704f8d64cb2f9732dba61e48da Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Delete declarative contact after remove it from the model.Renato Araujo Oliveira Filho2014-04-242-4/+52
| | | | | | | | | | Keep any contact fetched by the model update even if the contact is not in the model. Delete any fetched contact if it get removed from the engine. Change-Id: I646cc2d53ca7bb25b107f44c9517c0aac6814422 Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* Do not delete m_filter on the destructorAlbert Astals Cid2014-04-172-2/+13
| | | | | | | | | It is totally unexpected that QDeclarativeOrganizerModel takes ownership of the filter passed in setFilter given that filter will coming from the QML side. Change-Id: Ib0e7453961fdadab40b38acbdda147c462e321db Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>