qt:qtpim.git
3 years agoCorrect expected results when using ICU
Matt Vogt [Tue, 13 May 2014 03:01:38 +0000 (13:01 +1000)]
Correct expected results when using ICU

ICU produces different collation results than strcoll.

Change-Id: Ib0f87deefb5c2efe8ab57a895189788e86f1ebd1
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years agoMake the qcontactmanagerfiltering test pass
Matt Vogt [Thu, 1 May 2014 02:56:32 +0000 (12:56 +1000)]
Make the qcontactmanagerfiltering test pass

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>
3 years agoFix the generic implementation of relationship filtering
Matt Vogt [Thu, 1 May 2014 02:55:15 +0000 (12:55 +1000)]
Fix the generic implementation of relationship filtering

Change-Id: I86de6318a5a09f28720662be364be3243baa5c77
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years agoRemove dependency on jsondb for generic tests
Matt Vogt [Tue, 4 Mar 2014 05:37:10 +0000 (21:37 -0800)]
Remove dependency on jsondb for generic tests

The  tests for qcontactmanager and qcontactmanagerdetails do not
require jsondb.

Change-Id: Ib5d814fec7abc699b2664e51fba60ef6031bb149
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years agoRemove the 'local' text from the IdFilter description
Matt Vogt [Fri, 28 Feb 2014 03:54:00 +0000 (19:54 -0800)]
Remove the 'local' text from the IdFilter description

This change was missed in the conversion from QContactLocalIdFilter to
QContactIdFilter.

Change-Id: I8ad6e434e463b8996ddd5362c3bf8a0f20e3a916
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years agoExport QDeclarativeContactInvalidFilter and QDeclarativeOrganizerItemInvalidFilter...
Renato Araujo Oliveira Filho [Sat, 10 May 2014 15:12:44 +0000 (12:12 -0300)]
Export QDeclarativeContactInvalidFilter and 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>
3 years ago[ContactModel] Make better use of shared filter and fetchHint
Konstantin Ritt [Sun, 20 Apr 2014 06:25:45 +0000 (09:25 +0300)]
[ContactModel] Make better use of shared filter and fetchHint

Change-Id: Icad104410c353bc70a1a9ea37386910d147750ac
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years ago[OrganizerModel] Don't delete fetchHint we don't own
Konstantin Ritt [Sun, 20 Apr 2014 06:22:00 +0000 (09:22 +0300)]
[OrganizerModel] Don't delete fetchHint we don't own

Do generally what we're doing for m_filter.

Change-Id: I12c54eae27b342b01cd16a6aea714664bde62694
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years ago[OrganizerModel] Don't track the inactive filter
Konstantin Ritt [Sat, 19 Apr 2014 05:08:39 +0000 (08:08 +0300)]
[OrganizerModel] Don't track the inactive filter

Change-Id: If36d05f4c2e729704f8d64cb2f9732dba61e48da
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoDelete declarative contact after remove it from the model.
Renato Araujo Oliveira Filho [Fri, 7 Mar 2014 18:11:27 +0000 (15:11 -0300)]
Delete declarative contact after remove it from the model.

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>
3 years agoDo not delete m_filter on the destructor
Albert Astals Cid [Thu, 17 Apr 2014 10:57:09 +0000 (12:57 +0200)]
Do not delete m_filter on the destructor

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>
3 years agoMinor clean-up for plugin .pro files
Konstantin Ritt [Mon, 14 Apr 2014 09:17:21 +0000 (12:17 +0300)]
Minor clean-up for plugin .pro files

Change-Id: Ie17a754db273154f8579a508a244272fb4c0a73f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoMake use of $$MODULE_PLUGIN_TYPES
Konstantin Ritt [Mon, 14 Apr 2014 09:15:12 +0000 (12:15 +0300)]
Make use of $$MODULE_PLUGIN_TYPES

This fix build after 48b107ecfe216b93361ee162999e0cd0ee1cee41

Change-Id: I9baacd384e280736c8cb05150bb14ac5549be62f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoQmlOrganizer: delete removed collection safely
Michael Krasnyk [Tue, 21 Jan 2014 14:45:51 +0000 (16:45 +0200)]
QmlOrganizer: delete removed collection safely

Change-Id: Id41e1dad1f26d185cfdef038da7cd2839cd8ae0b
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years agoMake *AbstractRequest::type() non-virtual
Konstantin Ritt [Wed, 19 Mar 2014 04:24:18 +0000 (06:24 +0200)]
Make *AbstractRequest::type() non-virtual

There is no need to protect m_type with mutex
as it only changes at construction time.

Change-Id: Id009443a6c01715a80e9cf1fbb04bc8aa18bb047
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years ago[Organizer] Fix declarative meta types registration
Konstantin Ritt [Wed, 19 Mar 2014 04:04:50 +0000 (06:04 +0200)]
[Organizer] Fix declarative meta types registration

Explicitly register types needed for OrganizerModel;
Don't register InvalidFilter - it is for internal use only.

Change-Id: I05b754d359709f502bb8191e667835513a273d96
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoMerge branch 'master' into dev
Alex Blasche [Wed, 2 Apr 2014 12:56:01 +0000 (14:56 +0200)]
Merge branch 'master' into dev

Change-Id: Iea9c37473b2b9d09883a09086c1f41c6b0d94bcf

3 years agoFix QOrganizerItemFilter::testDebugStreamOut() test failures
Konstantin Ritt [Wed, 22 Jan 2014 17:13:32 +0000 (19:13 +0200)]
Fix QOrganizerItemFilter::testDebugStreamOut() test failures

Change-Id: I37734f233f9cbfdeb25480b1167e023aed7b042d
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoWork around issues in qtpim. The primary target is to unblock integration
Alex Blasche [Tue, 25 Mar 2014 09:26:01 +0000 (10:26 +0100)]
Work around issues in qtpim. The primary target is to unblock integration

Currently all of qtpim integration is dead as tests fail left and
right. Target is to unblock qtpim/dev branch running against
a CI targeting qtbase/stable. This is the as is state
and promises to be a bit safer due to the stability difference
between stable and dev at this point in time. Later we will change this
to the proper target (being the dev branch).

Once everything is unlocked we will continue regular integration using
qtpim/dev and closing down master.

Work arounds so far:

- Skip qmlorganizer::OrganizerRecurrenceTests::test_changeTimePeriod(row 0)

Change-Id: I0033537cfeab7e9986d8b0f8b0d0a94baf643b63
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoSet the contact detail parent to avoid memory leak.
Renato Araujo Oliveira Filho [Tue, 4 Feb 2014 18:27:34 +0000 (15:27 -0300)]
Set the contact detail parent to avoid memory leak.

Change-Id: I4eed6039c398d537254441e4e5873838a7866c6c
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Gustavo Pichorim Boiko <gustavo.boiko@canonical.com>
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years agoNormalize signal & slot signatures in connection
Thiago Macieira [Sun, 2 Feb 2014 22:08:26 +0000 (14:08 -0800)]
Normalize signal & slot signatures in connection

Profiling shows Qt Creator spends 2% of its load time normalizing

Change-Id: I46826476f25e7d60a93a0697378dabc442c9e364
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoMake simple wrappers don't derive from QQmlParserStatus
Konstantin Ritt [Fri, 17 Jan 2014 19:05:35 +0000 (21:05 +0200)]
Make simple wrappers don't derive from QQmlParserStatus

This completes 3275aad72a85f6f7e32f80c67c1e6fd87d8ab68c
and fixes similar issues not handled by it.

Change-Id: I07e7ec866864887866a72b92e453e83d9bb681f6
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years agoMake sort order with unset field act on a detail presence
Konstantin Ritt [Tue, 21 Jan 2014 18:59:14 +0000 (20:59 +0200)]
Make sort order with unset field act on a detail presence

...so that the organizer item with a detail of the specified type
would appear before or after the organizer item that lacks a detail
of the specified type, according to sortorder's blankPolicy().

Change-Id: I9ca28dc03dc5d6d4a28475ee91509fd0d5eee2ac
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years agoPorting qmlorganizer auto tests
Michael Krasnyk [Mon, 20 Jan 2014 15:20:02 +0000 (17:20 +0200)]
Porting qmlorganizer auto tests

Tests have been adopted to new QML organizer interfaces.
Now memory backend is a reference one and jsondb backend tests
are optional. Also some code duplications and
unconditional wait functions have been removed.

Change-Id: Iac291343f04103b7a7970a199e860cf4fc58f5e8
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years ago[QOrganizerCollection] Add SecondaryColor metadata key
Konstantin Ritt [Mon, 20 Jan 2014 12:38:59 +0000 (14:38 +0200)]
[QOrganizerCollection] Add SecondaryColor metadata key

Similarly to Color and Image metadata keys, this could be useful
in data visualization purpose.

Change-Id: Ibd1e59b2f2bec41052eee8cd6a95eef1d47410e7
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoQtOrganizer: reduce code duplication
Michael Krasnyk [Fri, 10 Jan 2014 13:00:55 +0000 (15:00 +0200)]
QtOrganizer: reduce code duplication

inline modifier without static implies external linkage,
so an arbitrary realization of functions may be used
without a warning or error message (tested with gcc).
According to DRY principle, it is better to keep one realization.

Change-Id: Id67a71af0998603707c8c8608e7a9dcd881670f3
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years ago[Memory backend] Allow to modify the default collection
Konstantin Ritt [Tue, 21 Jan 2014 00:42:40 +0000 (02:42 +0200)]
[Memory backend] Allow to modify the default collection

...just like JsonDB backend did.
It sounds odd that one can not change the default collection's content,
i.e. replace the default name with a localized one or change
the collection's color.

Change-Id: If7d5ced0351416c430277908c1b6c43ed7eb576d
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years agoQmlOrganizer: fix limit date conversion in a recurrence rule
Michael Krasnyk [Mon, 20 Jan 2014 13:43:42 +0000 (15:43 +0200)]
QmlOrganizer: fix limit date conversion in a recurrence rule

Convert DateTime to QDate in the UTC timezone similar to a conversion
in QDeclarativeOrganizerItemRecurrence::setRecurrenceDates.
Otherwise the limit date will depend on the local timezone
and resulting recurrent dates will be different for TZ=HST and TZ=JST.

Change-Id: Ie87d1304cc8cae7441aeff521b9d0fd2f3276001
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years agoQtOrganizer: fix initial date for recurrent events
Michael Krasnyk [Sun, 5 Jan 2014 09:07:22 +0000 (11:07 +0200)]
QtOrganizer: fix initial date for recurrent events

Skip events before the initial date of a recurrent event.
Otherwise the resulting number of events is wrong
for rules with COUNT,
e.g. "RRULE:FREQ=WEEKLY;COUNT=8;BYDAY=MO,TU,WE".
If the initial date is on Wednesday the resulting dates list
will have only 6 entries.

Change-Id: I801911d34ed0e0d1f5b2e66aab657e79b087b024
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years agoQtOrganizer: unescape &equ; character in engine id string
Michael Krasnyk [Fri, 10 Jan 2014 13:19:24 +0000 (15:19 +0200)]
QtOrganizer: unescape &equ; character in engine id string

Change-Id: Ibf5e3019eb132088ddb5b282ab03d4ccbb8440b3
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
3 years agowhitespace fixes
Oswald Buddenhagen [Fri, 17 Jan 2014 18:31:34 +0000 (19:31 +0100)]
whitespace fixes

remove trailing whitespace & expand tabs

Change-Id: I7dd5aca1f157d7798227302b315bfb0e9f2e9f77
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
3 years agoEmit valueChanged on appending a recurrence detail
Michael Krasnyk [Fri, 17 Jan 2014 12:47:50 +0000 (14:47 +0200)]
Emit valueChanged on appending a recurrence detail

Change-Id: Ibdbcb73602909c0ce9e12cf579a83730e814d7d7
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years agoOptimize QOrganizerManagerEngine::addSorted()
Konstantin Ritt [Fri, 17 Jan 2014 21:34:19 +0000 (23:34 +0200)]
Optimize QOrganizerManagerEngine::addSorted()

...by using std::upper_bound instead of linear search.

Change-Id: Ia990126e7e3fc1ead9b111fd80a5f5329b516d12
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years agoAvoid gcc warnings
Konstantin Ritt [Fri, 17 Jan 2014 21:01:52 +0000 (23:01 +0200)]
Avoid gcc warnings

<variable> defined but no used
and
<variable> may be used uninitialized in this function

Change-Id: Ic4ae4afc31113bddd3a6c0ede742f67d22f1c444
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years agoUse STL algorithms instead of Qt's deprecated ones
Konstantin Ritt [Fri, 17 Jan 2014 21:00:41 +0000 (23:00 +0200)]
Use STL algorithms instead of Qt's deprecated ones

Change-Id: I58262ef9be93f36465a64f79d0c71a5c83e0ad9e
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years agoEmit dataChanged() on item modifications
Michael Krasnyk [Fri, 20 Dec 2013 13:55:13 +0000 (15:55 +0200)]
Emit dataChanged() on item modifications

Change-Id: I1783128465ec56edf8bd67692beefde23715ad9c
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years ago[QOrganizerItemMemoryEngine] Optimize work with collections
Konstantin Ritt [Mon, 6 Jan 2014 22:12:17 +0000 (00:12 +0200)]
[QOrganizerItemMemoryEngine] Optimize work with collections

Use QHash instead of QList, thus reducing access time.

Change-Id: I87f7f0561d0fb1bc67fa78f5cc3e703f17addba1
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoTreat detail filter with unset field like a "detail exists" filter
Konstantin Ritt [Thu, 9 Jan 2014 21:20:16 +0000 (23:20 +0200)]
Treat detail filter with unset field like a "detail exists" filter

QtContacts filters already meant that; do the same for QtOrganizer filters.

Change-Id: I1af2d10f1456fb0763a5e078f9ab901eed0873a9
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoDon't use deprecated qtAddLibrary()
Konstantin Ritt [Tue, 14 Jan 2014 05:04:48 +0000 (07:04 +0200)]
Don't use deprecated qtAddLibrary()

This fixes a warning generated by qmake for every test.

Change-Id: Ifb1393bd58453051b2552b0c68397b591cbc4ccd
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoMake QtDeclarative an optional dependency
Konstantin Ritt [Tue, 14 Jan 2014 04:58:43 +0000 (06:58 +0200)]
Make QtDeclarative an optional dependency

Change-Id: I07431e5e51adb0cf86565afbbebc84704295a434
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoFix threaded request synchronization issues
Konstantin Ritt [Tue, 14 Jan 2014 04:55:08 +0000 (06:55 +0200)]
Fix threaded request synchronization issues

Like it was predicted, 26b2eab752073dc1d8b5769b7cfe307b9982e5b3
encovered the undefined behavior with the request notification
synchronization in case when the request gets updated from within
another thread - i.e. resultAvailable() or stateChanged() notification
could be delivered after the request has been destroyed.

Change-Id: I3411391511ae61d6aa8feb00b1cb0d1f7c431a25
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoSeparate SortOrder tests out from Filter tests
Konstantin Ritt [Fri, 10 Jan 2014 19:51:38 +0000 (21:51 +0200)]
Separate SortOrder tests out from Filter tests

...and increase the functionality coverage.

Change-Id: I2a228e1881d021baff51b18a2901107956e21f81
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoRequire the request be non-null
Konstantin Ritt [Mon, 6 Jan 2014 09:10:40 +0000 (11:10 +0200)]
Require the request be non-null

Handlers shouln't silently ignore a null requests; if the request
is null, then something went wrong and must be fixed.

Change-Id: Ic0691fd87e0c8b2e3081e539d75db247b6d4ae78
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
3 years agoQtOrganizer: fix SortOrder initialization
Michael Krasnyk [Fri, 3 Jan 2014 11:00:30 +0000 (13:00 +0200)]
QtOrganizer: fix SortOrder initialization

Method QDeclarativeOrganizerItemSortOrder::sortOrder()
can be called before a componentComplete() call
that leads to an uninitialized sort order private data.

Change-Id: I4c16642cc30563a05a43e8fcd60aa4e7e5dc7f1b
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoNotify the request destruction from Q*AbstractRequest dtor
Konstantin Ritt [Sat, 4 Jan 2014 13:21:12 +0000 (15:21 +0200)]
Notify the request destruction from Q*AbstractRequest dtor

...rather than from subclass'es dtor.
This brings us closer to what QObject does, disallowing fancy
manipulations on a partially destroyed request.

Change-Id: Ifaa31e4fbf7bde552b4ca62676ae25c5b8dc8ac5
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoCheck that the request don't get deleted in a slot
Konstantin Ritt [Mon, 6 Jan 2014 21:43:01 +0000 (23:43 +0200)]
Check that the request don't get deleted in a slot

Deleting sender() in a slot isn't allowed, really.
Produce an assert for now to help the existing users fix their code.

Change-Id: I784ec6f7bc0116b4bf5be8da086dae9492bf3aea
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoUse the installed headers
Konstantin Ritt [Wed, 8 Jan 2014 06:08:45 +0000 (08:08 +0200)]
Use the installed headers

This fixes synqt warnings about incorrect inclusions in public headers.
Also deals with extra- and duplicate includes, forward declaration,
namespacing issues, and circular dependencies...
...and Qt-ifies the headers after all.

Change-Id: Ia373d6fb93e0fecedd2a2334fbeb4c2005a67a4c
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years ago[QOrganizerItemMemoryEngine] Reduce code duplication in saveItem()
Konstantin Ritt [Thu, 26 Dec 2013 20:46:11 +0000 (22:46 +0200)]
[QOrganizerItemMemoryEngine] Reduce code duplication in saveItem()

This greatly improves the code readability.

Change-Id: I3aa7456b49d5366f1489b774ef546a6e9c923254
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years agoOrganizer: Optimize assignment and comparison operators
Konstantin Ritt [Sat, 21 Dec 2013 17:09:40 +0000 (19:09 +0200)]
Organizer: Optimize assignment and comparison operators

Change-Id: Ie9192c59704d37cc19c11e570622fe5beaf5096e
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years agoFix thread-safety for Q*AbstractRequest in operator debug
Konstantin Ritt [Sat, 4 Jan 2014 12:24:14 +0000 (14:24 +0200)]
Fix thread-safety for Q*AbstractRequest in operator debug

debugStreamOut() accesses the data otherwise protected with mutex.

Change-Id: I9e40c0b05a61a2b325fc919748cc7650364ed84f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years agoDon't mention "mobility" in QtPim
Konstantin Ritt [Sat, 4 Jan 2014 14:33:41 +0000 (16:33 +0200)]
Don't mention "mobility" in QtPim

...and replace QTM_USE_NAMESPACE with appropriate namespace(s).
Some occurrences intentionally omitted in the code
that requires Service Framework.

Change-Id: I553b93f6773f434e7752ffa7a25091741dda79e5
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoMove the declarative bindings out of the module namespace
Konstantin Ritt [Mon, 6 Jan 2014 08:38:48 +0000 (10:38 +0200)]
Move the declarative bindings out of the module namespace

This fixes a broken types in QML (the typical error from engine is like
"QMetaProperty::read: Unable to handle unregistered datatype
'QDeclarativeOrganizerItemType::ItemType' for
property 'QtOrganizer::QDeclarativeOrganizerEvent::itemType")

This reverts 75d049f770f86 and magically fixes related issues missed in it.

Task-number: QTBUG-35276

Change-Id: I792cf2bb3ff8f5ea7b59438ddf3107009eb2bc63
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoQtOrganizer: fix QML enum property types
Michael Krasnyk [Fri, 3 Jan 2014 05:35:56 +0000 (07:35 +0200)]
QtOrganizer: fix QML enum property types

Fix QML enum property types bug that is similar
to QTBUG-35276 "Qt Contacts 5.0 Filter:
Unable to assign int to [unknown property type]"

The problematic code leads to QML errors like
"QMetaProperty::read: Unable to handle unregistered datatype
'QDeclarativeOrganizerItemType::ItemType' for
property 'QtOrganizer::QDeclarativeOrganizerEvent::itemType"

Change-Id: I6b128f7cbee0075708f0985d582a56b12fbe3ed1
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
3 years ago[QOrganizerItemMemoryEngine] Decrease code duplication
Konstantin Ritt [Thu, 26 Dec 2013 21:22:49 +0000 (23:22 +0200)]
[QOrganizerItemMemoryEngine] Decrease code duplication

Change-Id: I6d5430b75fe09c335c92d253d56a27940dc7af15
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years ago[QOrganizerItemMemoryEngine] Fix collection change notifications
Konstantin Ritt [Thu, 26 Dec 2013 12:14:03 +0000 (14:14 +0200)]
[QOrganizerItemMemoryEngine] Fix collection change notifications

Since the backend could share the data across instances,
all instances that share changed data must be notified
(do exactly the same as for QOrganizerItemChangeSet).

Change-Id: Iff50b8f0c8b67ed102128ff0a64854c3856aa7f3
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years ago[QOrganizerItemMemoryEngine] Don't keep anonymous store in hash
Konstantin Ritt [Thu, 26 Dec 2013 12:50:45 +0000 (14:50 +0200)]
[QOrganizerItemMemoryEngine] Don't keep anonymous store in hash

This solves a possible issue when "id" parameter value equals to
some existing anonymous store's UUID.

Change-Id: I5608310f02674e6b2e54512cc5c6c06a3ff94aba
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years ago[QOrganizerItemMemoryEngineData] Get rid of extra ref counter
Konstantin Ritt [Wed, 25 Dec 2013 21:55:53 +0000 (23:55 +0200)]
[QOrganizerItemMemoryEngineData] Get rid of extra ref counter

QOrganizerItemMemoryEngineData is a QSharedData successor
and thus already ref-counted; simply use existing counter.

Change-Id: I2c6f34215dd1149d33cbccfd8e85288f5e5ec241
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years ago[QOrganizerItemMemoryEngineData] Get rid of unused member
Konstantin Ritt [Thu, 26 Dec 2013 12:53:37 +0000 (14:53 +0200)]
[QOrganizerItemMemoryEngineData] Get rid of unused member

Change-Id: I7fcad310b16da6dc694f58b9b845e4ca5e0ff12f
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
3 years ago[versit] Handle malformed concatentations of vCard files
Chris Adams [Fri, 20 Dec 2013 02:00:45 +0000 (12:00 +1000)]
[versit] Handle malformed concatentations of vCard files

If vCard documents which do not end in \r\n are concatenated together,
the result is a malformed vCard document with a line like
END:VCARDBEGIN:VCARD\r\n
in it.  This commit adds logic to the parser to detect those types of
lines and replace them with
END:VCARD\r\nBEGIN:VCARD\r\n
lines.

Signed-off-by: Chris Adams <chris.adams@jollamobile.com>
Change-Id: I9de0bfebaa640fd2a166342e4e310edb76f1cc15
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoDrop some refactoring leftovers
Konstantin Ritt [Sat, 21 Dec 2013 16:58:59 +0000 (18:58 +0200)]
Drop some refactoring leftovers

There is no any single QStringLiteral occurrence; simply remove.

Change-Id: I27d43da7a41786e9844a4b1205b040d0cadcdc0a
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoDeclare missing operators for QOrganizerItemFetchHint::OptimizationHints
Konstantin Ritt [Tue, 17 Dec 2013 12:17:13 +0000 (14:17 +0200)]
Declare missing operators for QOrganizerItemFetchHint::OptimizationHints

Change-Id: Ia1f544c6b7f6f15afd52d94992f2532fa2de7790
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
3 years agoAdd missing comparison operators
Konstantin Ritt [Mon, 16 Dec 2013 10:45:15 +0000 (12:45 +0200)]
Add missing comparison operators

Change-Id: I14c8b03602559822b1e7b9c1d26515c619cf1ae8
Reviewed-by: Michael Krasnyk <michael.krasnyk@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agoQt Organizer: do not emit unnecessary collectionsChanged signals
Michael Krasnyk [Fri, 13 Dec 2013 14:06:53 +0000 (16:06 +0200)]
Qt Organizer: do not emit unnecessary collectionsChanged signals

Prevent emitting of unnecessary collectionsChanged signals
without collections modifications. These signals lead
to a reset without real changes of collections models
based on QList.

Change-Id: I7d36209e40c62a2c7d43340e645b3567754470b3
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agoFix declarative model update for items with a modified order
Michael Krasnyk [Fri, 29 Nov 2013 13:55:40 +0000 (15:55 +0200)]
Fix declarative model update for items with a modified order

Remove an item from the model internal list
if it is notified and has changed own position.

Otherwise the duplicate item will be inserted and
an arbitrary item can be deleted from the list,
causing m_items list corruption.

Change-Id: I66766ded115d21b64e2f6265215045eae8cc525b
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoRemove unused qtjsbackend module from sync.profile
Sergio Ahumada [Thu, 12 Dec 2013 15:31:21 +0000 (16:31 +0100)]
Remove unused qtjsbackend module from sync.profile

Change-Id: Ie32eaa458974b514e57355837ba54f25fa1fa597
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoUpdate QDeclarativeContact contactId field after creation.
Renato Araujo Oliveira Filho [Wed, 7 Aug 2013 00:46:22 +0000 (21:46 -0300)]
Update QDeclarativeContact contactId field after creation.

Make sure that the new contact receives a contact ID after
call "save" method.

Change-Id: I09a1f8ab6ddd404a95bb314891e556f746de1a6a
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoFixed "removePreferredDetail" locks due a infinite loop.
Renato Araujo Oliveira Filho [Tue, 10 Sep 2013 22:57:52 +0000 (19:57 -0300)]
Fixed "removePreferredDetail" locks due a infinite loop.

Missing interator increment.

Change-Id: Iee4a5d337b96c67d26474973a1e7d6a33d8b0f9d
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoUpdate the contact model when the sort and filter change.
Gustavo Pichorim Boiko [Tue, 13 Aug 2013 13:52:16 +0000 (10:52 -0300)]
Update the contact model when the sort and filter change.

When the filter and sort order change, the model was just appending new results
to the model without removing entries that don't match the filter anymore and
without updating the sort order of existing entries.
The easy fix for this would be to reset the model before creating a new contact
request, but this causes the delegates on the QML UI to be destroyed and
recreated, which results in flickering and not smooth UI interactions.
This change does a selective update of the model by doing the following steps
when the contact fetch request finishes:
- remove entries that don't belong to the result set anymore
- append items that are not yet in the model and move items that are at wrong
  positions to their final position.
Task-number: QTBUG-32863

Change-Id: I5dae693bf6c5b1c2bb8229670b0d7cad29f512d4
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoheadersclean: Fix compiler warnings
Thiago Macieira [Mon, 3 Jun 2013 22:59:41 +0000 (15:59 -0700)]
headersclean: Fix compiler warnings

This change is not complete. There are plenty more warnings.

qcontactid.h:115:61: error: extra ‘;’ [-pedantic]
qcontactfilter.h:123:58: error: extra ‘;’ [-pedantic]
qcontactfetchhint.h:100:68: error: extra ‘;’ [-pedantic]
qcontactdetail.h:153:20: error: declaration of ‘contexts’ shadows a member of 'this' [-Werror=shadow]
qcontactactionfactory.h:66:48: error: declaration of ‘parent’ shadows a member of 'this' [-Werror=shadow]
qcontactmanager.h:72:5: error: "Q_QDOC" is not defined [-Werror=undef]

Change-Id: I0a6fc98cbedbabfddcc1971d9e51fca42ac61f30
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoAvoid wrong contact update into the model.
Renato Araujo Oliveira Filho [Tue, 6 Aug 2013 18:58:20 +0000 (15:58 -0300)]
Avoid wrong contact update into the model.

Change-Id: Ia8dbcdec96a5f7b25842f76c6b1aae46c5553c3e
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoPut the memory manager last, if it is found.
Robin Burchell [Tue, 6 Aug 2013 22:54:25 +0000 (00:54 +0200)]
Put the memory manager last, if it is found.

This means that it is more likely that we will pick a plugin that is actually
relevant to real-world usage.

Change-Id: I658c7b3968aa131fc1cd296f53fd202f9f1a6682
Reviewed-by: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoAdded support to preferredDetails on QML Contact.
Renato Araujo Oliveira Filho [Fri, 19 Jul 2013 18:23:01 +0000 (15:23 -0300)]
Added support to preferredDetails on QML Contact.

Expose all functions related to preferredDetails
into QML contacts.

Task-number: QTBUG-32515

Change-Id: I93491cd8ef25cecd891334c7bc17cbb52773acd8
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agoFixed QDeclarativeContactDetailFilter.
Renato Araujo Oliveira Filho [Fri, 19 Jul 2013 23:59:17 +0000 (20:59 -0300)]
Fixed QDeclarativeContactDetailFilter.

Fixed the type used on enum for QDeclarativeContactDetailFilter.detail.
Fixed typo in notify signals.

Task-number: QTBUG-32561

Change-Id: I8d98b0be61468c242430c21041a7116b02327256
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoFixed QContact::preferredDetails()
Renato Araujo Oliveira Filho [Fri, 19 Jul 2013 16:06:22 +0000 (13:06 -0300)]
Fixed QContact::preferredDetails()

The functions was trying to get the detail from the internal detail list using the detail id as list index.
Instead of that we need lookup into the list for the correct detail id.

Change-Id: Iefc4ec8771b86c990af89bfecc3731565c711222
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoPrevent duplicated contacts on QDeclarativeContactModel.
Renato Araujo Oliveira Filho [Tue, 9 Jul 2013 19:14:19 +0000 (16:14 -0300)]
Prevent duplicated contacts on QDeclarativeContactModel.

Fixed contact update function to use 'dataChanged' signal insted of 'beginInsertRows' which causes contact duplication.

Task-number: QTBUG-32324
Change-Id: Ic872da1caa9db6faf6f3f1be3fc78df448d92baf
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agoCreated protocol property in QDeclarativeContactOnlineAccount.
Renato Araujo Oliveira Filho [Mon, 1 Jul 2013 14:45:35 +0000 (11:45 -0300)]
Created protocol property in QDeclarativeContactOnlineAccount.

Exported protocol property and OnlineAccountProtocol enum in QDeclarativeContactOnlineAccount.

Task-number: QTBUG-32142

Change-Id: I4e3a5fda659bbb48b56e83b96de3e59a03549c31
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Alex <alexander.blasche@digia.com>
4 years agoFixed test to make sure that works with 5.1.1.
Renato Araujo Oliveira Filho [Sun, 14 Jul 2013 00:41:41 +0000 (21:41 -0300)]
Fixed test to make sure that works with 5.1.1.

Change-Id: Ia867a8cdcbee66e8f0e92821ebcd0e205efb0895
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoFixed vcard contact importer.
Renato Araujo Oliveira Filho [Mon, 17 Jun 2013 20:21:13 +0000 (17:21 -0300)]
Fixed vcard contact importer.

Avoid to set a empty list on Phone and Address sub-type fields.
This will avoid problems with contact equal operator since the QContact does not set the empty list as default.

Change-Id: Ic46cee70117ebea85efc3bb1ee0ec83d5a81bcea
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoChanged QDeclarativeContactModel behavior to quick show results.
Renato Araujo Oliveira Filho [Wed, 26 Jun 2013 17:31:14 +0000 (14:31 -0300)]
Changed QDeclarativeContactModel behavior to quick show results.

Uses "resultsAvailable" signal to shows the contacts in the model as soon as it become available, instead of wait for Fetch finish.

Change-Id: I7412a543e39b999b778f0a1fb588cedb8e043860
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoFixed import contact from a vcard.
Renato Araujo Oliveira Filho [Thu, 20 Jun 2013 21:17:19 +0000 (18:17 -0300)]
Fixed import contact from a vcard.

Avoid create invalid entries on the Address sub-types.

Change-Id: I0b0719924aedeea39c45697953a82605d5563987
Reviewed-by: Alex <alexander.blasche@digia.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoAdd license files mandated by (L)GPL and FDL.
Timo Jyrinki [Thu, 23 May 2013 10:48:01 +0000 (13:48 +0300)]
Add license files mandated by (L)GPL and FDL.

Some rarer modules are still missing the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules, so that the
(L)GPL and FDL licenses are adhered.

These files were wget:d from:

https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LGPL_EXCEPTION.txt
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.LGPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.GPL
https://qt.gitorious.org/qt/qtbase/blobs/raw/stable/LICENSE.FDL

Change-Id: I768fce95ae84e55ad246721a7cdc5facaa0046e7
Reviewed-by: Jason McDonald <macadder1@gmail.com>
4 years agoAllow overriding default QContactManagerEngine via env var
Matt Vogt [Wed, 12 Jun 2013 02:12:44 +0000 (12:12 +1000)]
Allow overriding default QContactManagerEngine via env var

Add support for overriding the default QContactManagerEngine via the
QTCONTACTS_MANAGER_OVERRIDE environment variable.

Port forward from QtMobility Contacts, commit 47079b33a0c1b5fe2301bb527cca12df13f3b1d6

Change-Id: I073904e0d61065719a7eacc8437943e2e157f6dc
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
4 years agoFixed vcard parse to check for OTHER context.
Renato Araujo Oliveira Filho [Thu, 16 May 2013 18:39:37 +0000 (15:39 -0300)]
Fixed vcard parse to check for OTHER context.

Change-Id: I43047a8697f2f83acd0064770bfc1e022f9fd837
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
4 years agoUpdate all plugins.qmltypes files
Liang Qi [Tue, 28 May 2013 18:11:29 +0000 (20:11 +0200)]
Update all plugins.qmltypes files

Task-number: QTBUG-31388

Change-Id: I702df25dca713933287bfdab4518dab4c8291d17
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
4 years agoFixed QML bindings.
Renato Araujo Oliveira Filho [Fri, 10 May 2013 17:15:23 +0000 (14:15 -0300)]
Fixed QML bindings.

Register types in QML without namespace.

Task-number: QTBUG-29830

Change-Id: I03c40750b2b8ad4c079c0ea818e058fd5e0d18fb
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
4 years agomake use of qtHaveModule()
Oswald Buddenhagen [Fri, 21 Dec 2012 10:47:06 +0000 (11:47 +0100)]
make use of qtHaveModule()

Change-Id: If8bf4d22042435ebce01a8116e771642abed42b6
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Laszlo Papp <lpapp@kde.org>
4 years agoMake QtContacts and QtOrganizer identified modules.
Timo Jyrinki [Thu, 14 Feb 2013 12:24:03 +0000 (14:24 +0200)]
Make QtContacts and QtOrganizer identified modules.

An user reported the following warning when running a self written
qml app:

"Module 'QtOrganizer' does not contain a module identifier directive - it
cannot be protected from external registrations."

I found that a similar issue in Qt Multimedia (QTBUG-28376) was fixed
by adding a line into qmldir making it an identified module. This commit
does similar addition for contacts and organizer.

Change-Id: I36ab53c688721158bf92de88847ff7a8cfa36798
Reviewed-by: Andy Nichols <andy.nichols@digia.com>
4 years agofix compile
Oswald Buddenhagen [Wed, 13 Mar 2013 10:54:14 +0000 (11:54 +0100)]
fix compile

work around compatibility issue between Q_GLOBAL_STATIC_WITH_ARGS and
QStringLiteral:
qt5/qtpim/src/contacts/qcontactmanager_p.cpp:81:484: error: lambda-expression in unevaluated context

Change-Id: I70fb7d405140f3a5a811c0f8021a7ab3ac754ede
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 years agodefine MODULE_VERSION
Oswald Buddenhagen [Tue, 26 Feb 2013 11:52:24 +0000 (12:52 +0100)]
define MODULE_VERSION

Task-number: QTBUG-29838
Change-Id: Ie2672445ebaf0097621024c3323f043a723929c5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 years agoAdjust QT*_{BEGIN,END}_NAMESPACE macro
Sergio Ahumada [Wed, 13 Mar 2013 10:55:12 +0000 (11:55 +0100)]
Adjust QT*_{BEGIN,END}_NAMESPACE macro

Changed to QT_{BEGIN,END}_NAMESPACE_* to match syncqt and
tst_header's checks.

Change-Id: If41721bf6be1294c9e0068af74917afc246603e9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoAdd missing QT_{BEGIN,END}_NAMESPACE_<MODULE>
Sergio Ahumada [Tue, 26 Mar 2013 11:16:50 +0000 (12:16 +0100)]
Add missing QT_{BEGIN,END}_NAMESPACE_<MODULE>

These are actually added for uniformity and to make tst_headers pass.
There is no other real reason other than that.

Change-Id: Ie5e629931cc5c6fa38bf7b1748363fd478047736
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoremove some unnecessary CONFIG additions
Oswald Buddenhagen [Fri, 14 Dec 2012 18:37:50 +0000 (19:37 +0100)]
remove some unnecessary CONFIG additions

qt is already added by spec_pre.prf, warn_on and depend_includepath by
default_pre.prf.

Change-Id: I369b4d74a089374b7e3696bb8b2f1dab81c7ce62
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
4 years agoFix Q_DECLARE_METATYPE uses.
Stephen Kelly [Wed, 19 Dec 2012 12:18:58 +0000 (13:18 +0100)]
Fix Q_DECLARE_METATYPE uses.

Remove one use of it which is unnecessary (The QList of an already
declared metatype), and move the other to the top of the file,
particularly above the use of qRegisterMetaType with it.

The use of qRegisterMetaType above the use of Q_DECLARE_METATYPE in
the file caused an ODR violation.

Also use the nullary overload of qRegisterMetaType instead of using
a typo-prone string. Using the non-nullary overload is what caused
the ODR violation in the first place.

Change-Id: I60f5060af85d76489c74ecc08d085941183f9532
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
4 years agopoint dependencies to stable branches
Oswald Buddenhagen [Thu, 13 Dec 2012 10:06:57 +0000 (11:06 +0100)]
point dependencies to stable branches

Change-Id: I3ba0bb34673924c6d29d5a984b9d3d28ee3ead5f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoremove symbian vestiges
Oswald Buddenhagen [Mon, 3 Dec 2012 20:42:12 +0000 (21:42 +0100)]
remove symbian vestiges

Change-Id: Ifc2d878141e52dc13e6787253b76ec1c7acbc999
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoadjust to qt_plugin.prf changes
Oswald Buddenhagen [Wed, 24 Oct 2012 13:34:57 +0000 (15:34 +0200)]
adjust to qt_plugin.prf changes

DESTDIR and INSTALLS+=target are set up automatically now, but
PLUGIN_TYPE needs to be defined.
also, skip TARGET munging, TEMPLATE assigment and some CONFIG addition
which are all done automatically.

Change-Id: Ie846b0bc67856959a1eb3850ce77b75d5dd760f8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoRemoved the dead "simulator" code path from project file.
Xizhi Zhu [Wed, 31 Oct 2012 16:42:45 +0000 (18:42 +0200)]
Removed the dead "simulator" code path from project file.

Change-Id: I3e2b2209add5ce9bf121a86d26cd97203b7cd902
Reviewed-by: Xizhi Zhu <xizhi.zhu@gmail.com>
5 years agoRemoved deprecated APIs.
Xizhi Zhu [Tue, 7 Aug 2012 04:51:45 +0000 (07:51 +0300)]
Removed deprecated APIs.

Change-Id: Ie5de6970811f9c3dd6500bdac9abe04d31df6caa
Reviewed-by: Xizhi Zhu <xizhi.zhu@gmail.com>
5 years agoPrepare removal of Softkeys API
Jan Arve Saether [Tue, 23 Oct 2012 12:56:11 +0000 (14:56 +0200)]
Prepare removal of Softkeys API

Change-Id: Ia68bdf1033717ecfc7e72cf2c24a85d0a4a1273f
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoFix the qml list interface
Marco Bubke [Tue, 23 Oct 2012 14:46:11 +0000 (16:46 +0200)]
Fix the qml list interface

The qml list interface was changed, so that there is now a read only
constructor and the default properties are removed. This is because the
original interface was very runtime centric, like other parts in qml.
The new interface was changed for the needs of the qml designer and
debugger.

Task-number: QTBUG-9390

Change-Id: I52e9e946e4986107677a130f4e46e820f000b55e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>