Merge lp:~timo-jyrinki/ubuntu/saucy/qtpim-opensource-src/new_snapshot into lp:ubuntu/saucy/qtpim-opensource-src

[Timo Jyrinki]

* New upstream snapshot release
  * debian/patches/added-support-to-preferreddetails-on-qml-contact.patch:
    - Drop, merged upstream

* New upstream snapshot release
  * debian/patches/added-support-to-preferreddetails-on-qml-contact.patch:
    - Drop, merged upstream

From packaging branch lp:~kubuntu-packagers/kubuntu-packaging/qtpim-opensource-src

Test build at https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-proper/+sourcepub/3452535/+listing-archive-extra

Tested by upgrading from the PPA, compiling and running examples from the source code.

=== removed directory '.pc/added-support-to-preferreddetails-on-qml-contact.patch'
=== removed directory '.pc/added-support-to-preferreddetails-on-qml-contact.patch/examples'
=== removed directory '.pc/added-support-to-preferreddetails-on-qml-contact.patch/examples/contacts'
=== removed directory '.pc/added-support-to-preferreddetails-on-qml-contact.patch/examples/contacts/qmlcontactslistview'
=== removed file '.pc/added-support-to-preferreddetails-on-qml-contact.patch/examples/contacts/qmlcontactslistview/ContactEditor.qml'
--- .pc/added-support-to-preferreddetails-on-qml-contact.patch/examples/contacts/qmlcontactslistview/ContactEditor.qml	2013-07-25 18:41:12 +0000
+++ .pc/added-support-to-preferreddetails-on-qml-contact.patch/examples/contacts/qmlcontactslistview/ContactEditor.qml	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Pim Module.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file.  Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-
-Rectangle {
-    width: parent.width
-    color: "pink"
-    property variant contact // contact that is shown in editView
-
-    // ![Widgets for manipulating contact details]
-    Column {
-        spacing: 8
-        anchors {
-            fill: parent
-            leftMargin: 10
-            topMargin: 10
-        }
-        DetailEditWidget { id: nameField; label: "Name "; value: contact ? contact.name.firstName : " "}
-        DetailEditWidget { id: emailField; label: "Email Address "; value: contact ? contact.email.emailAddress : " "}
-        DetailEditWidget { id: phoneField; label: "Phone Number "; value: contact ? contact.phoneNumber.number : " "}
-    }
-    // ![Widgets for manipulating contact details]
-
-    function deleteContact() {
-        contactsModel.removeContact(contactEditor.contact.contactId)
-        statusBar.updateMsg("contact successfully deleted")
-     }
-
-    function updateContact() {
-        // read in values from the input fields
-        var values = [nameField.value, emailField.value, phoneField.value]
-        if (!contact) { // create new contact
-            var newContact = Qt.createQmlObject("import QtContacts 5.0; Contact{ }", contactEditor)
-            setDetailValues(newContact, values)
-            newContact.save()
-            contactsModel.saveContact(newContact)
-            statusBar.updateMsg("new contact successfully created")
-        } else { // update existing contact
-            if (contact.modified) {
-                setDetailValues(contact, values)
-                contact.save()
-                statusBar.updateMsg("contact successfully updated")
-            } else {
-                statusBar.updateMsg("nothing to update, contact already is up-to-date")
-            }
-        }
-    }
-
-    function setDetailValues(c, values) {
-        c.name.firstName = values[0]
-        c.email.emailAddress = values[1]
-        c.phoneNumber.number = values[2]
-    }
-
-    function cancel() {
-        contact = ""
-    }
-
-    function resetToDefaults() {
-        nameField.inputFocus = false
-        emailField.inputFocus = false
-        phoneField.inputFocus = false
-        nameField.color = "black"
-        emailField.color = "black"
-        phoneField.color = "black"
-    }
-}
-

=== removed file '.pc/added-support-to-preferreddetails-on-qml-contact.patch/examples/contacts/qmlcontactslistview/DetailEditWidget.qml'
--- .pc/added-support-to-preferreddetails-on-qml-contact.patch/examples/contacts/qmlcontactslistview/DetailEditWidget.qml	2013-07-25 18:41:12 +0000
+++ .pc/added-support-to-preferreddetails-on-qml-contact.patch/examples/contacts/qmlcontactslistview/DetailEditWidget.qml	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the documentation of the Qt Pim Module.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Free Documentation License Usage
-** Alternatively, this file may be used under the terms of the GNU Free
-** Documentation License version 1.3 as published by the Free Software
-** Foundation and appearing in the file included in the packaging of
-** this file.  Please review the following information to ensure
-** the GNU Free Documentation License version 1.3 requirements
-** will be met: http://www.gnu.org/copyleft/fdl.html.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-import QtQuick 2.0
-// ![Custom DetailsEditWidget is used for entering new or modifying existing contact detlais]
-Item {
-    width: parent.width - 30
-    height: 20
-
-    property alias label: label.text
-    property alias value: valueText.text
-    property alias color: valueText.color
-    property alias inputFocus: valueText.focus
-
-    property string old
-
-    Text {
-        id: label
-        font {
-            family: "Helvetica"
-            pixelSize: 15
-            bold: true
-            italic: true
-        }
-    }
-
-    Rectangle {
-        width: 180
-        height: 20
-        anchors.left: label.right
-        anchors.leftMargin: 6
-        color: "white"
-        border {
-            width: 2
-            color: "darkgreen"
-        }
-
-        TextInput {
-            id: valueText
-            anchors.fill: parent
-            anchors.leftMargin: 5
-            font {
-                pixelSize: 16
-                family: "Helvetica"
-            }
-            onFocusChanged: {
-                if (focus === true) { // when entering text field
-                    old = valueText.text
-                } else { // when exiting text field
-                    if (valueText.text !== old) {
-                        valueText.color = "red"
-                    }
-                }
-            }
-        }
-    }
-}
-// ![Custom DetailsEditWidget is used for entering new or modifying existing contact detlais]

=== removed directory '.pc/added-support-to-preferreddetails-on-qml-contact.patch/src'
=== removed directory '.pc/added-support-to-preferreddetails-on-qml-contact.patch/src/imports'
=== removed directory '.pc/added-support-to-preferreddetails-on-qml-contact.patch/src/imports/contacts'
=== removed file '.pc/added-support-to-preferreddetails-on-qml-contact.patch/src/imports/contacts/qdeclarativecontact.cpp'
--- .pc/added-support-to-preferreddetails-on-qml-contact.patch/src/imports/contacts/qdeclarativecontact.cpp	2013-07-25 18:41:12 +0000
+++ .pc/added-support-to-preferreddetails-on-qml-contact.patch/src/imports/contacts/qdeclarativecontact.cpp	1970-01-01 00:00:00 +0000
@@ -1,765 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <qcontactdetails.h>
-#include <qcontactmanager.h>
-#include "qdeclarativecontact_p.h"
-#include "qdeclarativecontactmodel_p.h"
-
-#include <QtQml/qqmlengine.h>
-
-#include <QUrl>
-#include <QQmlListProperty>
-
-/*!
-    \qmltype Contact
-    \instantiates QDeclarativeContact
-    \brief The Contact element represents an addressbook contact.
-    \ingroup qml-contacts-main
-    \inqmlmodule QtContacts 5.0
-
-    The Contact element is part of the \b{QtContacts} module.
-
-    A Contact object has a collection of details (like a name, phone numbers and
-    email addresses).  Each detail (which can have multiple fields) is stored
-    in an appropriate subclass of ContactDetail, and the Contact allows
-    retrieving these details in various ways.
-
-    If some of the contact details are not unique details, all of this type of detail values
-    can be accessed by the property with the name in plural. For example, if there are 3 phone numbers stored in
-    a contact, they can be accessed by contact.phoneNumbers property, which holds a list of
-    all PhoneNumber details. If a contact does not contain a detail of particular type,
-    the value of the corresponding singular property (e.g. phoneNumber) in undefined and the
-    plural (e.g. phoneNumbers) is empty. The list of properties which support multiple detail
-    instances depends on the contact engine implementations.
-
-    \sa QContact
-*/
-
-
-QT_BEGIN_NAMESPACE_CONTACTS
-
-
-// call-back function templates for list properties
-template <typename T, QDeclarativeContactDetail::DetailType detailType>
-static void list_property_append(QQmlListProperty<T> *, T *)
-{
-}
-
-template <typename T, QDeclarativeContactDetail::DetailType detailType>
-static int list_property_count(QQmlListProperty<T> *property)
-{
-    QDeclarativeContact *object = qobject_cast<QDeclarativeContact *>(property->object);
-    if (object)
-        return object->details(detailType).size();
-    else
-        return 0;
-}
-
-template <typename T, QDeclarativeContactDetail::DetailType detailType>
-static T *list_property_at(QQmlListProperty<T> *property, int index)
-{
-    QDeclarativeContact *object = qobject_cast<QDeclarativeContact *>(property->object);
-    if (object)
-        return qobject_cast<T *>(qvariant_cast<QObject*>(object->details(detailType).at(index)));
-    else
-        return 0;
-}
-
-template <typename T, QDeclarativeContactDetail::DetailType detailType>
-static void list_property_clear(QQmlListProperty<T> *)
-{
-}
-
-QDeclarativeContact::QDeclarativeContact(QObject *parent)
-    :QObject(parent)
-    , m_modified(false)
-{
-    connect(this, SIGNAL(contactChanged()), SLOT(setModified()));
-}
-
-QDeclarativeContact::~QDeclarativeContact()
-{
-    clearDetails();
-}
-
-void QDeclarativeContact::setContact(const QContact& contact)
-{
-    m_id = contact.id();
-    foreach (QDeclarativeContactDetail *detail, m_details)
-        delete detail;
-    m_details.clear();
-    QList<QContactDetail> details(contact.details());
-    foreach (const QContactDetail &detail, details) {
-        QDeclarativeContactDetail *contactDetail = QDeclarativeContactDetailFactory::createContactDetail(static_cast<QDeclarativeContactDetail::DetailType>(detail.type()));
-        contactDetail->setDetail(detail);
-        connect(contactDetail, SIGNAL(detailChanged()), this, SIGNAL(contactChanged()));
-        m_details.append(contactDetail);
-    }
-
-    m_modified = false;
-    emit contactChanged();
-}
-
-QContact QDeclarativeContact::contact() const
-{
-    QContact contact;
-    contact.setId(m_id);
-    foreach (QDeclarativeContactDetail *detail, m_details)
-        contact.saveDetail(&detail->detail());
-    return contact;
-}
-
-/*!
-    \qmlproperty bool Contact::modified
-
-    This property holds the dirty flag of the Contact object.
-    If the Contact has been changed, returns true, otherwise returns false.
-*/
-bool QDeclarativeContact::modified() const
-{
-     return m_modified;
-}
-
-void QDeclarativeContact::setModified()
-{
-    m_modified = true;
-}
-
-/*!
-    \qmlproperty enumeration Contact::type
-
-    This property holds type of the Contact, the value can be one of:
-
-    \list
-    \li Contact.Contact
-    \li Contact.Group
-    \endlist
-*/
-QDeclarativeContactType::ContactType QDeclarativeContact::type() const
-{
-    foreach (QDeclarativeContactDetail *detail, m_details) {
-        if (QDeclarativeContactDetail::Type == detail->detailType())
-           return static_cast<QDeclarativeContactType *>(detail)->type();
-    }
-    return QDeclarativeContactType::Contact;
-}
-
-/*!
-    \qmlmethod Contact::removeDetail(detail)
-
-    Removes the given contact \a detail from the contact, returns true if successful, otherwise returns false.
-*/
-
-bool QDeclarativeContact::removeDetail(QDeclarativeContactDetail* detail)
-{
-    if (detail) {
-        if (!detail->removable())
-            return false;
-        int key = detail->detail().key();
-        int i = 0;
-        foreach (QDeclarativeContactDetail *contactDetail, m_details) {
-            if (key == contactDetail->detail().key()) {
-                delete contactDetail;
-                m_details.removeAt(i);
-                emit contactChanged();
-                return true;
-            }
-        ++i;
-        }
-    }
-    return false;
-}
-
-/*!
-    \qmlmethod Contact::addDetail(detail)
-
-    Adds the given contact \a detail to the contact, returns true if successful, otherwise returns false.
-
-    Note: If the \a detail has been added into the same contact before, this operation will be ignored,
-    so if you want to add a \a detail multiple times, the \a detail should be copied before calling this function.
-*/
-bool QDeclarativeContact::addDetail(QDeclarativeContactDetail* detail)
-{
-    if (!detail || m_details.contains(detail))
-        return false;
-
-    QDeclarativeContactDetail *contactDetail = QDeclarativeContactDetailFactory::createContactDetail(detail->detailType());
-    contactDetail->setDetail(detail->detail());
-    connect(contactDetail, SIGNAL(detailChanged()), this, SIGNAL(contactChanged()));
-    m_details.append(contactDetail);
-
-    m_modified = true;
-    emit contactChanged();
-    return true;
-}
-
-/*!
-    \qmlproperty list<ContactDetail> Contact::contactDetails
-
-    This property holds the list of all the details that the contact has.
-*/
-QQmlListProperty<QDeclarativeContactDetail> QDeclarativeContact::contactDetails()
-{
-    return QQmlListProperty<QDeclarativeContactDetail>(this, 0,
-                                                                     &QDeclarativeContact::_q_detail_append,
-                                                                     &QDeclarativeContact::_q_detail_count,
-                                                                     &QDeclarativeContact::_q_detail_at,
-                                                                     &QDeclarativeContact::_q_detail_clear);
-}
-
-/*!
-    \qmlproperty int Contact::contactId
-
-    This property holds the id of the Contact object.
-    This property is read only.
-*/
-QString QDeclarativeContact::contactId() const
-{
-    return m_id.toString();
-}
-
-/*!
-    \qmlproperty string Contact::manager
-
-    This property holds the manager name which the Contact object comes from.
-*/
-QString QDeclarativeContact::manager() const
-{
-    return m_id.managerUri();
-}
-
-/*!
-    \qmlmethod QDeclarativeContactDetail* QDeclarativeContact::detail(int type)
-
-    Returns contactDetail object which detail name or detail type is \a name.
-*/
-QDeclarativeContactDetail* QDeclarativeContact::detail(int type)
-{
-    foreach (QDeclarativeContactDetail *detail, m_details) {
-        if (type == detail->detailType()) {
-            return detail;
-        }
-    }
-    return 0;
-}
-
-/*!
-    \qmlmethod QVariantList QDeclarativeContact::details(int type)
-
-    Returns a list of ContactDetail objects which detail name or detail type is \a name.
-*/
-QVariantList QDeclarativeContact::details(int type)
-{
-    QVariantList list;
-    foreach (QDeclarativeContactDetail *detail, m_details) {
-        if (type == detail->detailType()) {
-            list.append(QVariant::fromValue((QObject*)detail));
-        }
-    }
-    return list;
-}
-
-/*!
-    \qmlmethod Contact::clearDetails()
-
-    Remove all detail objects in this contact.
-*/
-void QDeclarativeContact::clearDetails()
-{
-    if (m_details.isEmpty())
-        return;
-
-    foreach (QDeclarativeContactDetail *detail, m_details)
-        delete detail;
-    m_details.clear();
-    m_modified = true;
-    emit contactChanged();
-}
-
-
-/*!
-    \qmlmethod Contact::save()
-
-    Saves this Contact if the contact has been modified.
-
-    \sa Contact::modified
-*/
-void QDeclarativeContact::save()
-{
-    if (modified()) {
-        QDeclarativeContactModel* model = qobject_cast<QDeclarativeContactModel*>(parent());
-        if (model) {
-            model->saveContact(this);
-            m_modified = false;
-        }
-    }
-}
-
-// convenient access to most frequently used details
-/*!
-    \qmlproperty Address Contact::address
-
-    This property holds the address detail of the Contact object. In case a contact has several addresses then
-    the first one is returned.
-*/
-QDeclarativeContactAddress* QDeclarativeContact::address()
-{
-    return getDetail<QDeclarativeContactAddress>(QDeclarativeContactDetail::Address);
-}
-
-/*!
-    \qmlproperty list<Address> Contact::addresses
-
-    This property holds the address details of the Contact object.
-*/
-QQmlListProperty<QDeclarativeContactAddress> QDeclarativeContact::addresses()
-{
-    return QQmlListProperty<QDeclarativeContactAddress>(
-                this,
-                0,
-                &list_property_append<QDeclarativeContactAddress, QDeclarativeContactDetail::Address>,
-                &list_property_count<QDeclarativeContactAddress, QDeclarativeContactDetail::Address>,
-                &list_property_at<QDeclarativeContactAddress, QDeclarativeContactDetail::Address>,
-                &list_property_clear<QDeclarativeContactAddress, QDeclarativeContactDetail::Address>);
-}
-
-/*!
-    \qmlproperty Anniversary Contact::anniversary
-
-    This property holds the anniversary detail of the Contact object.
-*/
-QDeclarativeContactAnniversary* QDeclarativeContact::anniversary()
-{
-    return getDetail<QDeclarativeContactAnniversary>(QDeclarativeContactDetail::Anniversary);
-}
-
-/*!
-    \qmlproperty Avatar Contact::avatar
-
-    This property holds the avatar detail of the Contact object.
-*/
-QDeclarativeContactAvatar* QDeclarativeContact::avatar()
-{
-    return getDetail<QDeclarativeContactAvatar>(QDeclarativeContactDetail::Avatar);
-}
-
-/*!
-    \qmlproperty Birthday Contact::birthday
-
-    This property holds the birthday detail of the Contact object.
-*/
-QDeclarativeContactBirthday*  QDeclarativeContact::birthday()
-{
-    return getDetail<QDeclarativeContactBirthday>(QDeclarativeContactDetail::Birthday);
-}
-
-/*!
-    \qmlproperty DisplayLabel Contact::displayLabel
-
-    This property holds the displayLabel detail of the Contact object.
-    display label is the one which gets displayed when a contact is created as per versit doc specs this is a "FN" property
-*/
-QDeclarativeContactDisplayLabel*  QDeclarativeContact::displayLabel()
-{
-    return getDetail<QDeclarativeContactDisplayLabel>(QDeclarativeContactDetail::DisplayLabel);
-}
-
-/*!
-    \qmlproperty EmailAddress Contact::email
-
-    This property holds the email address detail of the Contact object. In case a contact has several email addresses then
-    the first one is returned.
-*/
-QDeclarativeContactEmailAddress*  QDeclarativeContact::email()
-{
-    return getDetail<QDeclarativeContactEmailAddress>(QDeclarativeContactDetail::Email);
-}
-
-/*!
-    \qmlproperty list<EmailAddress> Contact::emails
-
-    This property holds the email address details of the Contact object.
-*/
-QQmlListProperty<QDeclarativeContactEmailAddress> QDeclarativeContact::emails()
-{
-    return QQmlListProperty<QDeclarativeContactEmailAddress>(
-                this,
-                0,
-                &list_property_append<QDeclarativeContactEmailAddress, QDeclarativeContactDetail::Email>,
-                &list_property_count<QDeclarativeContactEmailAddress, QDeclarativeContactDetail::Email>,
-                &list_property_at<QDeclarativeContactEmailAddress, QDeclarativeContactDetail::Email>,
-                &list_property_clear<QDeclarativeContactEmailAddress, QDeclarativeContactDetail::Email>);
-}
-
-/*!
-    \qmlproperty ExtendedDetail Contact::extendedDetail
-
-    This property holds the extended detail of the Contact object. In case a contact has several extended
-    details then the first one is returned.
-*/
-QDeclarativeContactExtendedDetail*  QDeclarativeContact::extendedDetail()
-{
-    return getDetail<QDeclarativeContactExtendedDetail>(QDeclarativeContactDetail::ExtendedDetail);
-}
-
-/*!
-    \qmlproperty list<ExtendedDetail> Contact::extendedDetails
-
-    This property holds the extended details of the Contact object.
-*/
-QQmlListProperty<QDeclarativeContactExtendedDetail> QDeclarativeContact::extendedDetails()
-{
-    return QQmlListProperty<QDeclarativeContactExtendedDetail>(
-                this,
-                0,
-                &list_property_append<QDeclarativeContactExtendedDetail, QDeclarativeContactDetail::ExtendedDetail>,
-                &list_property_count<QDeclarativeContactExtendedDetail, QDeclarativeContactDetail::ExtendedDetail>,
-                &list_property_at<QDeclarativeContactExtendedDetail, QDeclarativeContactDetail::ExtendedDetail>,
-                &list_property_clear<QDeclarativeContactExtendedDetail, QDeclarativeContactDetail::ExtendedDetail>);
-}
-
-/*!
-    \qmlproperty Family Contact::family
-
-    This property holds the family detail of the Contact object.
-*/
-QDeclarativeContactFamily*  QDeclarativeContact::family()
-{
-    return getDetail<QDeclarativeContactFamily>(QDeclarativeContactDetail::Family);
-}
-
-/*!
-    \qmlproperty Favorite Contact::favorite
-
-    This property holds the favorite detail of the Contact object.
-*/
-QDeclarativeContactFavorite*  QDeclarativeContact::favorite()
-{
-    return getDetail<QDeclarativeContactFavorite>(QDeclarativeContactDetail::Favorite);
-}
-
-/*!
-    \qmlproperty Gender Contact::gender
-
-    This property holds the gender detail of the Contact object.
-*/
-QDeclarativeContactGender*  QDeclarativeContact::gender()
-{
-    return getDetail<QDeclarativeContactGender>(QDeclarativeContactDetail::Gender);
-}
-
-/*!
-    \qmlproperty GeoLocation Contact::geolocation
-
-    This property holds the geolocation detail of the Contact object.
-*/
-QDeclarativeContactGeoLocation*  QDeclarativeContact::geolocation()
-{
-    return getDetail<QDeclarativeContactGeoLocation>(QDeclarativeContactDetail::Geolocation);
-}
-
-/*!
-    \qmlproperty GlobalPresence Contact::globalPresence
-
-    This property holds the globalPresence detail of the Contact object.
-*/
-QDeclarativeContactGlobalPresence*  QDeclarativeContact::globalPresence()
-{
-    return getDetail<QDeclarativeContactGlobalPresence>(QDeclarativeContactDetail::GlobalPresence);
-}
-
-/*!
-    \qmlproperty Guid Contact::guid
-
-    This property holds the guid detail of the Contact object.
-*/
-QDeclarativeContactGuid*  QDeclarativeContact::guid()
-{
-    return getDetail<QDeclarativeContactGuid>(QDeclarativeContactDetail::Guid);
-}
-
-/*!
-    \qmlproperty Hobby Contact::hobby
-
-    This property holds the hobby detail of the Contact object.
-*/
-QDeclarativeContactHobby*  QDeclarativeContact::hobby()
-{
-    return getDetail<QDeclarativeContactHobby>(QDeclarativeContactDetail::Hobby);
-}
-
-/*!
-    \qmlproperty Name Contact::name
-
-    This property holds the name detail of the Contact object.
-*/
-QDeclarativeContactName*  QDeclarativeContact::name()
-{
-   return getDetail<QDeclarativeContactName>(QDeclarativeContactDetail::Name);
-}
-
-/*!
-    \qmlproperty Nickname Contact::nickname
-
-    This property holds the nickname detail of the Contact object.
-*/
-QDeclarativeContactNickname*  QDeclarativeContact::nickname()
-{
-    return getDetail<QDeclarativeContactNickname>(QDeclarativeContactDetail::NickName);
-}
-
-/*!
-    \qmlproperty Note Contact::note
-
-    This property holds the note detail of the Contact object.
-*/
-QDeclarativeContactNote*  QDeclarativeContact::note()
-{
-    return getDetail<QDeclarativeContactNote>(QDeclarativeContactDetail::Note);
-}
-
-/*!
-    \qmlproperty OnlineAccount Contact::onlineAccount
-
-    This property holds the onlineAccount detail of the Contact object. In case a contact has several accounts then
-    the first one is returned.
-*/
-QDeclarativeContactOnlineAccount*  QDeclarativeContact::onlineAccount()
-{
-    return getDetail<QDeclarativeContactOnlineAccount>(QDeclarativeContactDetail::OnlineAccount);
-}
-
-/*!
-    \qmlproperty Organization Contact::organization
-
-    This property holds the organization detail of the Contact object.
-*/
-QDeclarativeContactOrganization*  QDeclarativeContact::organization()
-{
-    return getDetail<QDeclarativeContactOrganization>(QDeclarativeContactDetail::Organization);
-}
-
-/*!
-    \qmlproperty list<Organization> Contact::organizations
-
-    This property holds the organization details of the Contact object.
-*/
-QQmlListProperty<QDeclarativeContactOrganization> QDeclarativeContact::organizations()
-{
-    return QQmlListProperty<QDeclarativeContactOrganization>(
-                this,
-                0,
-                &list_property_append<QDeclarativeContactOrganization, QDeclarativeContactDetail::Organization>,
-                &list_property_count<QDeclarativeContactOrganization, QDeclarativeContactDetail::Organization>,
-                &list_property_at<QDeclarativeContactOrganization, QDeclarativeContactDetail::Organization>,
-                &list_property_clear<QDeclarativeContactOrganization, QDeclarativeContactDetail::Organization>);
-}
-
-/*!
-    \qmlproperty PhoneNumber Contact::phoneNumber
-
-    This property holds the phone number detail of the Contact object. In case a contact has several numbers then
-    the first one is returned.
-*/
-QDeclarativeContactPhoneNumber*  QDeclarativeContact::phoneNumber()
-{
-    return getDetail<QDeclarativeContactPhoneNumber>(QDeclarativeContactDetail::PhoneNumber);
-}
-
-/*!
-    \qmlproperty list<PhoneNumber> Contact::phoneNumbers
-
-    This property holds the phone number details of the Contact object.
-*/
-QQmlListProperty<QDeclarativeContactPhoneNumber> QDeclarativeContact::phoneNumbers()
-{
-    return QQmlListProperty<QDeclarativeContactPhoneNumber>(
-                this,
-                0,
-                &list_property_append<QDeclarativeContactPhoneNumber, QDeclarativeContactDetail::PhoneNumber>,
-                &list_property_count<QDeclarativeContactPhoneNumber, QDeclarativeContactDetail::PhoneNumber>,
-                &list_property_at<QDeclarativeContactPhoneNumber, QDeclarativeContactDetail::PhoneNumber>,
-                &list_property_clear<QDeclarativeContactPhoneNumber, QDeclarativeContactDetail::PhoneNumber>);
-}
-
-/*!
-    \qmlproperty Presence Contact::presence
-
-    This property holds the presence detail of the Contact object.
-*/
-QDeclarativeContactPresence*  QDeclarativeContact::presence()
-{
-    return getDetail<QDeclarativeContactPresence>(QDeclarativeContactDetail::Presence);
-}
-
-/*!
-    \qmlproperty Ringtone Contact::ringtone
-
-    This property holds the ringtone detail of the Contact object.
-*/
-QDeclarativeContactRingtone*  QDeclarativeContact::ringtone()
-{
-    return getDetail<QDeclarativeContactRingtone>(QDeclarativeContactDetail::Ringtone);
-}
-
-/*!
-    \qmlproperty SyncTarget Contact::syncTarget
-
-    This property holds the syncTarget detail of the Contact object.
-*/
-QDeclarativeContactSyncTarget*  QDeclarativeContact::syncTarget()
-{
-    return getDetail<QDeclarativeContactSyncTarget>(QDeclarativeContactDetail::SyncTarget);
-}
-
-/*!
-    \qmlproperty Tag Contact::tag
-
-    This property holds the tag detail of the Contact object.
-*/
-QDeclarativeContactTag*  QDeclarativeContact::tag()
-{
-    return getDetail<QDeclarativeContactTag>(QDeclarativeContactDetail::Tag);
-}
-
-/*!
-    \qmlproperty Timestamp Contact::timestamp
-
-    This property holds the timestamp detail of the Contact object.
-*/
-QDeclarativeContactTimestamp*  QDeclarativeContact::timestamp()
-{
-    return getDetail<QDeclarativeContactTimestamp>(QDeclarativeContactDetail::Timestamp);
-}
-
-/*!
-    \qmlproperty Url Contact::url
-
-    This property holds the url detail of the Contact object.
-*/
-QDeclarativeContactUrl*  QDeclarativeContact::url()
-{
-    return getDetail<QDeclarativeContactUrl>(QDeclarativeContactDetail::Url);
-}
-
-/*!
-    \qmlproperty list<Url> Contact::urls
-
-    This property holds the url details of the Contact object.
-*/
-QQmlListProperty<QDeclarativeContactUrl> QDeclarativeContact::urls()
-{
-    return QQmlListProperty<QDeclarativeContactUrl>(
-                this,
-                0,
-                &list_property_append<QDeclarativeContactUrl, QDeclarativeContactDetail::Url>,
-                &list_property_count<QDeclarativeContactUrl, QDeclarativeContactDetail::Url>,
-                &list_property_at<QDeclarativeContactUrl, QDeclarativeContactDetail::Url>,
-                &list_property_clear<QDeclarativeContactUrl, QDeclarativeContactDetail::Url>);
-}
-
-/*!
-    \qmlproperty Version Contact::version
-
-    This property holds the version detail of the Contact object.
-*/
-QDeclarativeContactVersion*  QDeclarativeContact::version()
-{
-    return getDetail<QDeclarativeContactVersion>(QDeclarativeContactDetail::Version);
-}
-
-// call-back functions for list property
-
-/*!
-    \internal
- */
-void QDeclarativeContact::_q_detail_append(QQmlListProperty<QDeclarativeContactDetail> *property, QDeclarativeContactDetail *value)
-{
-    QDeclarativeContact *object = qobject_cast<QDeclarativeContact *>(property->object);
-    if (object)
-    {
-        object->m_details.append(value);
-        value->connect(value, SIGNAL(valueChanged()), SIGNAL(detailChanged()), Qt::UniqueConnection);
-        value->connect(value, SIGNAL(detailChanged()), object, SIGNAL(contactChanged()), Qt::UniqueConnection);
-    }
-}
-
-/*!
-    \internal
- */
-QDeclarativeContactDetail *QDeclarativeContact::_q_detail_at(QQmlListProperty<QDeclarativeContactDetail> *property, int index)
-{
-    QDeclarativeContact *object = qobject_cast<QDeclarativeContact *>(property->object);
-    if (object)
-        return object->m_details.at(index);
-    else
-        return 0;
-}
-
-/*!
-    \internal
- */
-void QDeclarativeContact::_q_detail_clear(QQmlListProperty<QDeclarativeContactDetail> *property)
-{
-    QDeclarativeContact *object = qobject_cast<QDeclarativeContact *>(property->object);
-    if (object) {
-        foreach (QDeclarativeContactDetail *obj, object->m_details)
-            delete obj;
-        object->m_details.clear();
-    }
-}
-
-/*!
-    \internal
- */
-int QDeclarativeContact::_q_detail_count(QQmlListProperty<QDeclarativeContactDetail> *property)
-{
-    QDeclarativeContact *object = qobject_cast<QDeclarativeContact *>(property->object);
-    if (object)
-        return object->m_details.size();
-    else
-        return 0;
-}
-
-#include "moc_qdeclarativecontact_p.cpp"
-
-QT_END_NAMESPACE_CONTACTS

=== removed file '.pc/added-support-to-preferreddetails-on-qml-contact.patch/src/imports/contacts/qdeclarativecontact_p.h'
--- .pc/added-support-to-preferreddetails-on-qml-contact.patch/src/imports/contacts/qdeclarativecontact_p.h	2013-07-25 18:41:12 +0000
+++ .pc/added-support-to-preferreddetails-on-qml-contact.patch/src/imports/contacts/qdeclarativecontact_p.h	1970-01-01 00:00:00 +0000
@@ -1,209 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the QtQml module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-#ifndef QDECLARATIVECONTACT_P_H
-#define QDECLARATIVECONTACT_P_H
-
-#include <qcontact.h>
-#include <qcontactid.h>
-#include "qdeclarativecontactdetails_p.h"
-#include "qdeclarativecontacturl_p.h"
-#include "qdeclarativecontacthobby_p.h"
-#include "qdeclarativecontactdetail_p.h"
-#include <QtQml/qqmllist.h>
-
-QT_BEGIN_NAMESPACE_CONTACTS
-
-class QDeclarativeContact : public QObject
-{
-    Q_OBJECT
-
-    // basic information
-    Q_PROPERTY (bool modified READ modified)
-
-    Q_PROPERTY (QDeclarativeContactType::ContactType type READ type NOTIFY contactChanged)
-    Q_PROPERTY (QString contactId READ contactId NOTIFY contactIdChanged)
-    Q_PROPERTY (QString manager READ manager NOTIFY managerChanged)
-    Q_PROPERTY (QQmlListProperty<QDeclarativeContactDetail> contactDetails READ contactDetails NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactAddress* address READ address NOTIFY contactChanged)
-    Q_PROPERTY (QQmlListProperty<QDeclarativeContactAddress> addresses READ addresses NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactAnniversary* anniversary READ anniversary NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactAvatar* avatar READ avatar NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactBirthday*  birthday READ birthday NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactDisplayLabel*  displayLabel READ displayLabel NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactEmailAddress*  email READ email NOTIFY contactChanged)
-    Q_PROPERTY (QQmlListProperty<QDeclarativeContactEmailAddress> emails READ emails NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactExtendedDetail*  extendedDetail READ extendedDetail NOTIFY contactChanged)
-    Q_PROPERTY (QQmlListProperty<QDeclarativeContactExtendedDetail> extendedDetails READ extendedDetails NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactFamily*  family READ family NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactFavorite*  favorite READ favorite NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactGender*  gender READ gender NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactGeoLocation*  geolocation READ geolocation NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactGlobalPresence*  globalPresence READ globalPresence NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactGuid*  guid READ guid NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactHobby*  hobby READ hobby NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactName*  name READ name NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactNickname*  nickname READ nickname  NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactNote*  note READ note NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactOnlineAccount*  onlineAccount READ onlineAccount NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactOrganization*  organization READ organization  NOTIFY contactChanged)
-    Q_PROPERTY (QQmlListProperty<QDeclarativeContactOrganization>  organizations READ organizations  NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactPhoneNumber*  phoneNumber READ phoneNumber NOTIFY contactChanged)
-    Q_PROPERTY (QQmlListProperty<QDeclarativeContactPhoneNumber> phoneNumbers READ phoneNumbers NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactPresence*  presence READ presence NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactRingtone*  ringtone READ ringtone NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactSyncTarget*  syncTarget READ syncTarget NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactTag*  tag READ tag NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactTimestamp*  timestamp READ timestamp NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactUrl*  url READ url NOTIFY contactChanged)
-    Q_PROPERTY (QQmlListProperty<QDeclarativeContactUrl> urls READ urls NOTIFY contactChanged)
-    Q_PROPERTY (QDeclarativeContactVersion*  version READ version NOTIFY contactChanged)
-    Q_CLASSINFO("DefaultProperty", "contactDetails")
-
-public:
-
-    explicit QDeclarativeContact(QObject *parent = 0);
-    ~QDeclarativeContact();
-
-    void setContact(const QContact& c);
-    QContact contact() const;
-    bool modified() const;
-
-    QDeclarativeContactType::ContactType type() const;
-
-    QString contactId() const;
-    QString manager() const;
-    QQmlListProperty<QDeclarativeContactDetail> contactDetails();
-
-    // use int instead of QDeclarativeContactDetail::ContactType as a work-around for QTBUG-20639
-    Q_INVOKABLE QDeclarativeContactDetail* detail(int type);
-    Q_INVOKABLE QVariantList details(int type);
-
-    Q_INVOKABLE bool removeDetail(QDeclarativeContactDetail* detail);
-    Q_INVOKABLE bool addDetail(QDeclarativeContactDetail* detail);
-
-    QDeclarativeContactAddress* address();
-    QQmlListProperty<QDeclarativeContactAddress>  addresses();
-    QDeclarativeContactAnniversary* anniversary();
-    QDeclarativeContactAvatar* avatar();
-    QDeclarativeContactBirthday*  birthday();
-    QDeclarativeContactDisplayLabel* displayLabel();
-    QDeclarativeContactEmailAddress*  email();
-    QQmlListProperty<QDeclarativeContactEmailAddress>  emails();
-    QDeclarativeContactExtendedDetail*  extendedDetail();
-    QQmlListProperty<QDeclarativeContactExtendedDetail>  extendedDetails();
-    QDeclarativeContactFamily*  family();
-    QDeclarativeContactFavorite*  favorite();
-    QDeclarativeContactGender*  gender();
-    QDeclarativeContactGeoLocation*  geolocation();
-    QDeclarativeContactGlobalPresence*  globalPresence();
-    QDeclarativeContactGuid*  guid();
-    QDeclarativeContactHobby*  hobby();
-    QDeclarativeContactName*  name();
-    QDeclarativeContactNickname*  nickname();
-    QDeclarativeContactNote*  note();
-    QDeclarativeContactOnlineAccount*  onlineAccount();
-    QDeclarativeContactOrganization*  organization();
-    QQmlListProperty<QDeclarativeContactOrganization>  organizations();
-    QDeclarativeContactPhoneNumber*  phoneNumber();
-    QQmlListProperty<QDeclarativeContactPhoneNumber>  phoneNumbers();
-    QDeclarativeContactPresence*  presence();
-    QDeclarativeContactRingtone*  ringtone();
-    QDeclarativeContactSyncTarget*  syncTarget();
-    QDeclarativeContactTag*  tag();
-    QDeclarativeContactTimestamp*  timestamp();
-    QDeclarativeContactUrl*  url();
-    QQmlListProperty<QDeclarativeContactUrl>  urls();
-    QDeclarativeContactVersion*  version();
-
-protected:
-    bool m_modified;
-    QContactId m_id;
-
-    // always create a copy of the detail for QML
-    // however, seems the garbage collection can't delete all of them (QTBUG-20377)
-    QList<QDeclarativeContactDetail *> m_details;
-
-public slots:
-    void clearDetails();
-    void save();
-Q_SIGNALS:
-    void contactIdChanged();
-    void managerChanged();
-    void contactChanged();
-
-private slots:
-    void setModified();
-
-private:
-    Q_DISABLE_COPY(QDeclarativeContact)
-
-    template<typename T> T* getDetail(const QDeclarativeContactDetail::DetailType &type)
-    {
-        foreach (QDeclarativeContactDetail *detail, m_details) {
-            if (type == detail->detailType())
-            {
-                T* tempDetail = static_cast<T *>(detail);
-                return tempDetail;
-            }
-        }
-        T* detail = new T;
-        if (detail) {
-            m_details.append(detail);
-            emit contactChanged();
-            return detail;
-        }
-        return 0;
-    }
-
-    // call-back functions for list property
-    static void _q_detail_append(QQmlListProperty<QDeclarativeContactDetail> *property, QDeclarativeContactDetail *value);
-    static QDeclarativeContactDetail *_q_detail_at(QQmlListProperty<QDeclarativeContactDetail> *property, int index);
-    static void _q_detail_clear(QQmlListProperty<QDeclarativeContactDetail> *property);
-    static int _q_detail_count(QQmlListProperty<QDeclarativeContactDetail> *property);
-};
-
-QT_END_NAMESPACE_CONTACTS
-
-QTCONTACTS_USE_NAMESPACE
-
-QML_DECLARE_TYPE(QDeclarativeContact)
-
-#endif // QDECLARATIVECONTACT_P_H

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-07-25 18:41:12 +0000
+++ .pc/applied-patches	2013-08-29 11:23:11 +0000
@@ -1,2 +1,1 @@
 revert_module_version.patch
-added-support-to-preferreddetails-on-qml-contact.patch

=== modified file '.tag'
--- .tag	2013-07-25 18:41:12 +0000
+++ .tag	2013-08-29 11:23:11 +0000
@@ -1,1 +1,1 @@
-103993321e86b7e7698b5e6953991af1bb7f430e
+7bd0f9ad742558cf4b33aa7e372713fdb680d2ad

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-25 18:41:12 +0000
+++ debian/changelog	2013-08-29 11:23:11 +0000
@@ -1,3 +1,11 @@
+qtpim-opensource-src (5.0~git20130828-0ubuntu1) sauc; urgency=low
+
+  * New upstream snapshot release
+  * debian/patches/added-support-to-preferreddetails-on-qml-contact.patch:
+    - Drop, merged upstream
+
+ -- Timo Jyrinki <[e-mail]>  Thu, 29 Aug 2013 12:26:09 +0300
+
 qtpim-opensource-src (5.0~git20130723-0ubuntu1) saucy; urgency=low
 
   * New upstream snapshot release

=== removed file 'debian/patches/added-support-to-preferreddetails-on-qml-contact.patch'
--- debian/patches/added-support-to-preferreddetails-on-qml-contact.patch	2013-07-25 18:41:12 +0000
+++ debian/patches/added-support-to-preferreddetails-on-qml-contact.patch	1970-01-01 00:00:00 +0000
@@ -1,359 +0,0 @@
-From: Renato Araujo Oliveira Filho <[e-mail]>
-Date: Fri, 19 Jul 2013 15:23:01 -0300
-Subject: Added support to preferredDetails on QML Contact.
-
-Expose all functions related with preferredDetails
-into QML contacts.
-
-Task-number: QTBUG-32515
-
-Review: https://codereview.qt-project.org/#change,61289
----
- .../contacts/qmlcontactslistview/ContactEditor.qml |  39 +++++--
- .../qmlcontactslistview/DetailEditWidget.qml       |  35 +++++++
- src/imports/contacts/qdeclarativecontact.cpp       | 114 +++++++++++++++++++++
- src/imports/contacts/qdeclarativecontact_p.h       |   9 ++
- 4 files changed, 191 insertions(+), 6 deletions(-)
-
-diff --git a/examples/contacts/qmlcontactslistview/ContactEditor.qml b/examples/contacts/qmlcontactslistview/ContactEditor.qml
-index 81e5f97..9cce579 100644
---- a/examples/contacts/qmlcontactslistview/ContactEditor.qml
-+++ b/examples/contacts/qmlcontactslistview/ContactEditor.qml
-@@ -39,9 +39,25 @@ Rectangle {
-             leftMargin: 10
-             topMargin: 10
-         }
--        DetailEditWidget { id: nameField; label: "Name "; value: contact ? contact.name.firstName : " "}
--        DetailEditWidget { id: emailField; label: "Email Address "; value: contact ? contact.email.emailAddress : " "}
--        DetailEditWidget { id: phoneField; label: "Phone Number "; value: contact ? contact.phoneNumber.number : " "}
-+        DetailEditWidget {
-+            id: nameField
-+            label: "Name "
-+            value: contact ? contact.name.firstName : " "
-+        }
-+        DetailEditWidget {
-+            id: emailField
-+            label: "Email Address "
-+            value: contact ? contact.email.emailAddress : " "
-+            showPreferredField: true
-+            isPreferred: contact ? contact.isPreferredDetail("MESSAGE", contact.email) : false
-+        }
-+        DetailEditWidget {
-+            id: phoneField
-+            label: "Phone Number "
-+            value: contact ? contact.phoneNumber.number : " "
-+            showPreferredField: true
-+            isPreferred: contact ? contact.isPreferredDetail("CALL", contact.phoneNumber) : false
-+        }
-     }
-     // ![Widgets for manipulating contact details]
- 
-@@ -52,7 +68,9 @@ Rectangle {
- 
-     function updateContact() {
-         // read in values from the input fields
--        var values = [nameField.value, emailField.value, phoneField.value]
-+        var values = [nameField.value,
-+                      emailField.value, emailField.requestPreferred || emailField.isPreferred,
-+                      phoneField.value, phoneField.requestPreferred || phoneField.isPreferred]
-         if (!contact) { // create new contact
-             var newContact = Qt.createQmlObject("import QtContacts 5.0; Contact{ }", contactEditor)
-             setDetailValues(newContact, values)
-@@ -60,8 +78,8 @@ Rectangle {
-             contactsModel.saveContact(newContact)
-             statusBar.updateMsg("new contact successfully created")
-         } else { // update existing contact
-+            setDetailValues(contact, values)
-             if (contact.modified) {
--                setDetailValues(contact, values)
-                 contact.save()
-                 statusBar.updateMsg("contact successfully updated")
-             } else {
-@@ -73,7 +91,14 @@ Rectangle {
-     function setDetailValues(c, values) {
-         c.name.firstName = values[0]
-         c.email.emailAddress = values[1]
--        c.phoneNumber.number = values[2]
-+        c.phoneNumber.number = values[3]
-+        if (values[2]) {
-+            c.setPreferredDetail("MESSAGE", c.email)
-+        }
-+
-+        if (values[4]) {
-+            c.setPreferredDetail("CALL", c.phoneNumber)
-+        }
-     }
- 
-     function cancel() {
-@@ -84,6 +109,8 @@ Rectangle {
-         nameField.inputFocus = false
-         emailField.inputFocus = false
-         phoneField.inputFocus = false
-+        emailField.requestPreferred = false
-+        phoneField.requestPreferred = false
-         nameField.color = "black"
-         emailField.color = "black"
-         phoneField.color = "black"
-diff --git a/examples/contacts/qmlcontactslistview/DetailEditWidget.qml b/examples/contacts/qmlcontactslistview/DetailEditWidget.qml
-index e481941..4f490e2 100644
---- a/examples/contacts/qmlcontactslistview/DetailEditWidget.qml
-+++ b/examples/contacts/qmlcontactslistview/DetailEditWidget.qml
-@@ -34,6 +34,9 @@ Item {
-     property alias value: valueText.text
-     property alias color: valueText.color
-     property alias inputFocus: valueText.focus
-+    property bool isPreferred: false
-+    property bool requestPreferred: false
-+    property bool showPreferredField: false
- 
-     property string old
- 
-@@ -48,6 +51,7 @@ Item {
-     }
- 
-     Rectangle {
-+        id: inputField
-         width: 180
-         height: 20
-         anchors.left: label.right
-@@ -77,5 +81,36 @@ Item {
-             }
-         }
-     }
-+
-+    Text {
-+        id: labelFav
-+
-+        anchors.left: inputField.right
-+        anchors.leftMargin: 5
-+
-+        font {
-+            family: "Helvetica"
-+            pixelSize: 15
-+            bold: true
-+            italic: true
-+        }
-+        text: "favorite:"
-+        visible: showPreferredField
-+    }
-+
-+    Rectangle {
-+        anchors.left: labelFav.right
-+        anchors.leftMargin: 5
-+        anchors.verticalCenter: labelFav.verticalCenter
-+        width: 10
-+        height: 10
-+        color: isPreferred || requestPreferred ? "black" : "white"
-+        visible: showPreferredField
-+
-+        MouseArea {
-+            anchors.fill: parent
-+            onClicked: requestPreferred = !requestPreferred
-+        }
-+    }
- }
- // ![Custom DetailsEditWidget is used for entering new or modifying existing contact detlais]
-diff --git a/src/imports/contacts/qdeclarativecontact.cpp b/src/imports/contacts/qdeclarativecontact.cpp
-index 1346b46..2e08969 100644
---- a/src/imports/contacts/qdeclarativecontact.cpp
-+++ b/src/imports/contacts/qdeclarativecontact.cpp
-@@ -127,6 +127,8 @@ void QDeclarativeContact::setContact(const QContact& contact)
-     foreach (QDeclarativeContactDetail *detail, m_details)
-         delete detail;
-     m_details.clear();
-+    m_preferredDetails.clear();
-+
-     QList<QContactDetail> details(contact.details());
-     foreach (const QContactDetail &detail, details) {
-         QDeclarativeContactDetail *contactDetail = QDeclarativeContactDetailFactory::createContactDetail(static_cast<QDeclarativeContactDetail::DetailType>(detail.type()));
-@@ -135,6 +137,13 @@ void QDeclarativeContact::setContact(const QContact& contact)
-         m_details.append(contactDetail);
-     }
- 
-+    QMap<QString, QContactDetail> prefDetails(contact.preferredDetails());
-+    QMap<QString, QContactDetail>::const_iterator  it = prefDetails.begin();
-+    while (it != prefDetails.end()) {
-+        m_preferredDetails.insert(it.key(), it.value().key());
-+        it++;
-+    }
-+
-     m_modified = false;
-     emit contactChanged();
- }
-@@ -145,6 +154,13 @@ QContact QDeclarativeContact::contact() const
-     contact.setId(m_id);
-     foreach (QDeclarativeContactDetail *detail, m_details)
-         contact.saveDetail(&detail->detail());
-+
-+    QVariantMap prefDetails = preferredDetails();
-+    QVariantMap::const_iterator it = prefDetails.begin();
-+    while (it != prefDetails.end()) {
-+        contact.setPreferredDetail(it.key(), it.value().value<QDeclarativeContactDetail *>()->detail());
-+        it++;
-+    }
-     return contact;
- }
- 
-@@ -198,6 +214,7 @@ bool QDeclarativeContact::removeDetail(QDeclarativeContactDetail* detail)
-         int i = 0;
-         foreach (QDeclarativeContactDetail *contactDetail, m_details) {
-             if (key == contactDetail->detail().key()) {
-+                removePrefferedDetail(detail);
-                 delete contactDetail;
-                 m_details.removeAt(i);
-                 emit contactChanged();
-@@ -209,6 +226,16 @@ bool QDeclarativeContact::removeDetail(QDeclarativeContactDetail* detail)
-     return false;
- }
- 
-+void QDeclarativeContact::removePrefferedDetail(QDeclarativeContactDetail* detail)
-+{
-+    QMap<QString, int> cpy = m_preferredDetails;
-+    QMap<QString, int>::const_iterator it = cpy.begin();
-+    while (it != cpy.end()) {
-+        if (it.value() == detail->detail().key())
-+            m_preferredDetails.remove(it.key());
-+    }
-+}
-+
- /*!
-     \qmlmethod Contact::addDetail(detail)
- 
-@@ -233,6 +260,93 @@ bool QDeclarativeContact::addDetail(QDeclarativeContactDetail* detail)
- }
- 
- /*!
-+    \qmlmethod Contact::setPreferredDetail(actionName, detail)
-+
-+    Set a particular detail (\a preferredDetail) as the preferred detail for any actions with the given \a actionName.
-+
-+    The \a preferredDetail object must exist in this object, and the \a actionName cannot be empty.
-+
-+    Returns true if the preference could be recorded, and false otherwise.
-+
-+    \sa preferredDetail()
-+ */
-+bool QDeclarativeContact::setPreferredDetail(const QString& actionName, QDeclarativeContactDetail* detail)
-+{
-+   if (actionName.isEmpty() || !detail || !m_details.contains(detail))
-+        return false;
-+
-+   if (m_preferredDetails.contains(actionName) && m_preferredDetails[actionName] == detail->detail().key())
-+       return false;
-+
-+   m_preferredDetails.insert(actionName, detail->detail().key());
-+   m_modified = true;
-+   emit contactChanged();
-+   return true;
-+}
-+
-+/*!
-+    \qmlmethod Contact::isPreferredDetail(actionName, detail)
-+
-+    Returns true if the given \a detail is a preferred detail for the given \a actionName,
-+    or for any action if the \a actionName is empty.
-+
-+    \sa preferredDetail()
-+ */
-+bool QDeclarativeContact::isPreferredDetail(const QString& actionName, QDeclarativeContactDetail* detail) const
-+{
-+    if (actionName.isEmpty() || !detail || !m_details.contains(detail))
-+         return false;
-+
-+    if (!m_preferredDetails.contains(actionName))
-+        return false;
-+
-+    return (m_preferredDetails[actionName] == detail->detail().key());
-+}
-+
-+/*!
-+    \qmlmethod Contact::preferredDetail(actionName, detail)
-+
-+    Returns the preferred detail for a given \a actionName.
-+
-+    If the \a actionName is empty, or there is no preference recorded for
-+    the supplied \a actionName, returns null.
-+
-+    \sa preferredDetails()
-+ */
-+QDeclarativeContactDetail* QDeclarativeContact::preferredDetail(const QString& actionName) const
-+{
-+    int id = m_preferredDetails.value(actionName, -1);
-+    if (id == -1)
-+        return 0;
-+
-+    foreach (QDeclarativeContactDetail* detail, m_details) {
-+        if (detail->detail().key() == id)
-+            return detail;
-+    }
-+    return 0;
-+}
-+
-+
-+/*!
-+    \qmlproperty map<string, ContactDetail> Contact::preferredDetails
-+
-+    This property holds the recorded detail preferences for action names.
-+
-+    Each entry in the map has the action name as the key, and the corresponding
-+    preferred detail as the value.
-+ */
-+QVariantMap QDeclarativeContact::preferredDetails() const
-+{
-+    QVariantMap result;
-+    QMap<QString, int>::const_iterator it = m_preferredDetails.begin();
-+    while (it != m_preferredDetails.end()) {
-+        result.insert(it.key(), QVariant::fromValue<QDeclarativeContactDetail*>(preferredDetail(it.key())));
-+        it++;
-+    }
-+    return result;
-+}
-+
-+/*!
-     \qmlproperty list<ContactDetail> Contact::contactDetails
- 
-     This property holds the list of all the details that the contact has.
-diff --git a/src/imports/contacts/qdeclarativecontact_p.h b/src/imports/contacts/qdeclarativecontact_p.h
-index 9abf0d4..21a8879 100644
---- a/src/imports/contacts/qdeclarativecontact_p.h
-+++ b/src/imports/contacts/qdeclarativecontact_p.h
-@@ -95,6 +95,7 @@ class QDeclarativeContact : public QObject
-     Q_PROPERTY (QDeclarativeContactUrl*  url READ url NOTIFY contactChanged)
-     Q_PROPERTY (QQmlListProperty<QDeclarativeContactUrl> urls READ urls NOTIFY contactChanged)
-     Q_PROPERTY (QDeclarativeContactVersion*  version READ version NOTIFY contactChanged)
-+    Q_PROPERTY (QVariantMap preferredDetails READ preferredDetails NOTIFY contactChanged)
-     Q_CLASSINFO("DefaultProperty", "contactDetails")
- 
- public:
-@@ -119,6 +120,11 @@ public:
-     Q_INVOKABLE bool removeDetail(QDeclarativeContactDetail* detail);
-     Q_INVOKABLE bool addDetail(QDeclarativeContactDetail* detail);
- 
-+    Q_INVOKABLE bool setPreferredDetail(const QString& actionName, QDeclarativeContactDetail* detail);
-+    Q_INVOKABLE bool isPreferredDetail(const QString& actionName, QDeclarativeContactDetail* detail) const;
-+    Q_INVOKABLE QDeclarativeContactDetail* preferredDetail(const QString& actionName) const;
-+    QVariantMap preferredDetails() const;
-+
-     QDeclarativeContactAddress* address();
-     QQmlListProperty<QDeclarativeContactAddress>  addresses();
-     QDeclarativeContactAnniversary* anniversary();
-@@ -160,6 +166,7 @@ protected:
-     // always create a copy of the detail for QML
-     // however, seems the garbage collection can't delete all of them (QTBUG-20377)
-     QList<QDeclarativeContactDetail *> m_details;
-+    QMap<QString, int> m_preferredDetails;
- 
- public slots:
-     void clearDetails();
-@@ -193,6 +200,8 @@ private:
-         return 0;
-     }
- 
-+    void removePrefferedDetail(QDeclarativeContactDetail *detail);
-+
-     // call-back functions for list property
-     static void _q_detail_append(QQmlListProperty<QDeclarativeContactDetail> *property, QDeclarativeContactDetail *value);
-     static QDeclarativeContactDetail *_q_detail_at(QQmlListProperty<QDeclarativeContactDetail> *property, int index);
--- 
-1.8.3.2
-

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-25 18:41:12 +0000
+++ debian/patches/series	2013-08-29 11:23:11 +0000
@@ -1,2 +1,1 @@
 revert_module_version.patch
-added-support-to-preferreddetails-on-qml-contact.patch

=== modified file 'src/contacts/details/qcontacttype.h'
--- src/contacts/details/qcontacttype.h	2013-05-10 14:15:23 +0000
+++ src/contacts/details/qcontacttype.h	2013-08-29 11:23:11 +0000
@@ -67,7 +67,7 @@
         TypeGroup
     };
 
-    void setType(const TypeValues type) {setValue(FieldType, type);}
+    void setType(const TypeValues newType) {setValue(FieldType, newType);}
     TypeValues type() const {return static_cast<TypeValues>(value<int>(FieldType));}
 };
 

=== modified file 'src/contacts/qcontactabstractrequest.h'
--- src/contacts/qcontactabstractrequest.h	2013-05-10 14:15:23 +0000
+++ src/contacts/qcontactabstractrequest.h	2013-08-29 11:23:11 +0000
@@ -113,7 +113,7 @@
     QContactAbstractRequestPrivate* d_ptr;
 
 private:
-    QContactAbstractRequest(QObject* parent = 0) : QObject(parent), d_ptr(0) {}
+    QContactAbstractRequest(QObject* parent_ = 0) : QObject(parent_), d_ptr(0) {}
     Q_DISABLE_COPY(QContactAbstractRequest)
     friend class QContactManagerEngine;
     friend class QContactAbstractRequestPrivate;

=== modified file 'src/contacts/qcontactactionfactory.h'
--- src/contacts/qcontactactionfactory.h	2013-05-10 14:15:23 +0000
+++ src/contacts/qcontactactionfactory.h	2013-08-29 11:23:11 +0000
@@ -63,7 +63,7 @@
     Q_OBJECT
 
 public:
-    QContactActionFactory(QObject *parent = 0) : QObject(parent) {}
+    QContactActionFactory(QObject *parent_ = 0) : QObject(parent_) {}
     virtual ~QContactActionFactory();
     virtual QList<QContactActionDescriptor> actionDescriptors() const = 0;
     virtual QContactAction* create(const QContactActionDescriptor& which) const = 0;

=== modified file 'src/contacts/qcontactdetail.h'
--- src/contacts/qcontactdetail.h	2013-05-10 14:15:23 +0000
+++ src/contacts/qcontactdetail.h	2013-08-29 11:23:11 +0000
@@ -148,16 +148,16 @@
         return value(field).value<T>();
     }
 
-    void setContexts(int context)
+    void setContexts(int newContext)
     {
-        QList<int> contexts;
-        contexts << context;
-        setValue(FieldContext, QVariant::fromValue(contexts));
+        QList<int> newContexts;
+        newContexts << newContext;
+        setValue(FieldContext, QVariant::fromValue(newContexts));
     }
 
-    void setContexts(const QList<int>& contexts)
+    void setContexts(const QList<int>& newContexts)
     {
-        setValue(FieldContext, QVariant::fromValue(contexts));
+        setValue(FieldContext, QVariant::fromValue(newContexts));
     }
 
     QList<int> contexts() const
@@ -165,9 +165,9 @@
         return value< QList<int> >(FieldContext);
     }
 
-    void setDetailUri(const QString& detailUri)
+    void setDetailUri(const QString& newDetailUri)
     {
-        setValue(FieldDetailUri, detailUri);
+        setValue(FieldDetailUri, newDetailUri);
     }
 
     QString detailUri() const
@@ -175,9 +175,9 @@
         return value(FieldDetailUri).toString();
     }
 
-    void setLinkedDetailUris(const QStringList& linkedDetailUris)
+    void setLinkedDetailUris(const QStringList& newLinkedDetailUris)
     {
-        setValue(FieldLinkedDetailUris, linkedDetailUris);
+        setValue(FieldLinkedDetailUris, newLinkedDetailUris);
     }
 
     void setLinkedDetailUris(const QString& linkedDetailUri)

=== modified file 'src/contacts/qcontactfetchhint.h'
--- src/contacts/qcontactfetchhint.h	2013-05-10 14:15:23 +0000
+++ src/contacts/qcontactfetchhint.h	2013-08-29 11:23:11 +0000
@@ -97,7 +97,7 @@
 Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactFetchHint& hint);
 #endif
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QContactFetchHint::OptimizationHints);
+Q_DECLARE_OPERATORS_FOR_FLAGS(QContactFetchHint::OptimizationHints)
 
 QT_END_NAMESPACE_CONTACTS
 

=== modified file 'src/contacts/qcontactfilter.h'
--- src/contacts/qcontactfilter.h	2013-05-10 14:15:23 +0000
+++ src/contacts/qcontactfilter.h	2013-08-29 11:23:11 +0000
@@ -120,7 +120,7 @@
     QSharedDataPointer<QContactFilterPrivate> d_ptr;
 };
 
-Q_DECLARE_OPERATORS_FOR_FLAGS(QContactFilter::MatchFlags);
+Q_DECLARE_OPERATORS_FOR_FLAGS(QContactFilter::MatchFlags)
 
 const Q_CONTACTS_EXPORT QContactFilter operator&(const QContactFilter& left, const QContactFilter& right);
 const Q_CONTACTS_EXPORT QContactFilter operator|(const QContactFilter& left, const QContactFilter& right);

=== modified file 'src/contacts/qcontactid.h'
--- src/contacts/qcontactid.h	2013-05-10 14:15:23 +0000
+++ src/contacts/qcontactid.h	2013-08-29 11:23:11 +0000
@@ -112,7 +112,7 @@
 Q_DECLARE_TYPEINFO(QTCONTACTS_PREPEND_NAMESPACE(QContactId), Q_MOVABLE_TYPE);
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QTCONTACTS_PREPEND_NAMESPACE(QContactId));
+Q_DECLARE_METATYPE(QTCONTACTS_PREPEND_NAMESPACE(QContactId))
 
 
 #endif

=== modified file 'src/contacts/qcontactmanager.cpp'
--- src/contacts/qcontactmanager.cpp	2013-06-05 15:45:28 +0000
+++ src/contacts/qcontactmanager.cpp	2013-08-29 11:23:11 +0000
@@ -151,6 +151,10 @@
         ret.prepend(overrideManagerName);
     }
 
+    // bump memory to the end of the list
+    if (ret.removeAll(QStringLiteral("memory")))
+        ret.append(QStringLiteral("memory"));
+
     return ret;
 }
 

=== modified file 'src/contacts/qcontactmanager.h'
--- src/contacts/qcontactmanager.h	2013-05-10 14:15:23 +0000
+++ src/contacts/qcontactmanager.h	2013-08-29 11:23:11 +0000
@@ -69,7 +69,7 @@
     Q_OBJECT
 
 public:
-#if Q_QDOC // qdoc's parser fails to recognise the default map argument
+#ifdef Q_QDOC // qdoc's parser fails to recognise the default map argument
     explicit QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
     QContactManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
 #else

=== modified file 'src/imports/contacts/qdeclarativecontact.cpp'
--- src/imports/contacts/qdeclarativecontact.cpp	2013-07-25 18:41:12 +0000
+++ src/imports/contacts/qdeclarativecontact.cpp	2013-08-29 11:23:11 +0000
@@ -214,7 +214,7 @@
         int i = 0;
         foreach (QDeclarativeContactDetail *contactDetail, m_details) {
             if (key == contactDetail->detail().key()) {
-                removePrefferedDetail(detail);
+                removePreferredDetail(detail);
                 delete contactDetail;
                 m_details.removeAt(i);
                 emit contactChanged();
@@ -226,7 +226,7 @@
     return false;
 }
 
-void QDeclarativeContact::removePrefferedDetail(QDeclarativeContactDetail* detail)
+void QDeclarativeContact::removePreferredDetail(QDeclarativeContactDetail* detail)
 {
     QMap<QString, int> cpy = m_preferredDetails;
     QMap<QString, int>::const_iterator it = cpy.begin();

=== modified file 'src/imports/contacts/qdeclarativecontact_p.h'
--- src/imports/contacts/qdeclarativecontact_p.h	2013-07-25 18:41:12 +0000
+++ src/imports/contacts/qdeclarativecontact_p.h	2013-08-29 11:23:11 +0000
@@ -200,7 +200,7 @@
         return 0;
     }
 
-    void removePrefferedDetail(QDeclarativeContactDetail *detail);
+    void removePreferredDetail(QDeclarativeContactDetail *detail);
 
     // call-back functions for list property
     static void _q_detail_append(QQmlListProperty<QDeclarativeContactDetail> *property, QDeclarativeContactDetail *value);

=== modified file 'src/imports/contacts/qdeclarativecontactmodel.cpp'
--- src/imports/contacts/qdeclarativecontactmodel.cpp	2013-07-25 18:41:12 +0000
+++ src/imports/contacts/qdeclarativecontactmodel.cpp	2013-08-29 11:23:11 +0000
@@ -97,7 +97,8 @@
         m_filter(0),
         m_error(QContactManager::NoError),
         m_autoUpdate(true),
-        m_componentCompleted(false)
+        m_componentCompleted(false),
+        m_progressiveLoading(true)
     {
     }
     ~QDeclarativeContactModelPrivate()
@@ -126,6 +127,9 @@
     QUrl m_lastImportUrl;
     QAtomicInt m_lastRequestId;
     QHash<QContactAbstractRequest *, int> m_requestIdHash;
+    QList<QContactFetchRequest*> m_pendingRequests;
+    QList<QContact> m_pendingContacts;
+    bool m_progressiveLoading;
 };
 
 QDeclarativeContactModel::QDeclarativeContactModel(QObject *parent) :
@@ -712,42 +716,116 @@
     fetchRequest->setFetchHint(d->m_fetchHint ? d->m_fetchHint->fetchHint() : QContactFetchHint());
 
     connect(fetchRequest, SIGNAL(resultsAvailable()), this, SLOT(requestUpdated()));
+    connect(fetchRequest, SIGNAL(stateChanged(QContactAbstractRequest::State)),
+            this, SLOT(fetchRequestStateChanged(QContactAbstractRequest::State)));
+
+    // cancel all previous requests
+    foreach (QContactFetchRequest *req, d->m_pendingRequests) {
+        req->cancel();
+        req->deleteLater();
+    }
+
+    d->m_pendingContacts.clear();
+    d->m_pendingRequests.clear();
+    d->m_pendingRequests.append(fetchRequest);
+
+    // if we have no contacts yet, we can display results as soon as they arrive
+    // but if we are updating the model after a sort or filter change, we have to
+    // wait for all contacts before processing the update
+    d->m_progressiveLoading = d->m_contacts.isEmpty();
 
     fetchRequest->start();
 }
 
 void QDeclarativeContactModel::requestUpdated()
 {
+
     QContactFetchRequest* req = qobject_cast<QContactFetchRequest*>(QObject::sender());
     if (req) {
         QList<QContact> contacts = req->contacts();
-        QList<QDeclarativeContact*> dcs;
-        foreach (const QContact &c, contacts) {
-            if (d->m_contactMap.contains(c.id())) {
-                QDeclarativeContact* dc = d->m_contactMap.value(c.id());
-                dc->setContact(c);
-            } else {
-                QDeclarativeContact* dc = new QDeclarativeContact(this);
-                if (dc) {
-                    d->m_contactMap.insert(c.id(), dc);
+
+        // if we are starting from scratch, we can show contact results as they arrive
+        if (d->m_progressiveLoading) {
+            QList<QDeclarativeContact*> dcs;
+            foreach (const QContact &c, contacts) {
+                if (d->m_contactMap.contains(c.id())) {
+                    QDeclarativeContact* dc = d->m_contactMap.value(c.id());
                     dc->setContact(c);
-                    dcs.append(dc);
+                } else {
+                    QDeclarativeContact* dc = new QDeclarativeContact(this);
+                    if (dc) {
+                        d->m_contactMap.insert(c.id(), dc);
+                        dc->setContact(c);
+                        dcs.append(dc);
+                    }
                 }
             }
-        }
-
-        if (dcs.count() > 0) {
-            beginInsertRows(QModelIndex(), d->m_contacts.count(), d->m_contacts.count() + dcs.count() - 1);
-            // At this point we need to relay on the backend and assume that the partial results are following the fetch sorting property
-            d->m_contacts += dcs;
-            endInsertRows();
-
-            emit contactsChanged();
+
+            if (dcs.count() > 0) {
+                beginInsertRows(QModelIndex(), d->m_contacts.count(), d->m_contacts.count() + dcs.count() - 1);
+                // At this point we need to relay on the backend and assume that the partial results are following the fetch sorting property
+                d->m_contacts += dcs;
+                endInsertRows();
+
+                emit contactsChanged();
+            }
+        } else {
+            d->m_pendingContacts << contacts;
         }
 
         checkError(req);
-        if (req->isFinished())
-            req->deleteLater();
+    }
+}
+
+void QDeclarativeContactModel::fetchRequestStateChanged(QContactAbstractRequest::State newState)
+{
+    if (newState != QContactAbstractRequest::FinishedState)
+        return;
+
+    QContactFetchRequest* req = qobject_cast<QContactFetchRequest*>(QObject::sender());
+    if (req) {
+        // if we were not processing contacts as soon as they arrive, we need to process them here.
+        if (!d->m_progressiveLoading) {
+            // start by removing the contacts that don't belong to this result set anymore
+            for (int i = d->m_contacts.count()-1; i >= 0; --i) {
+                QDeclarativeContact *contact = d->m_contacts[i];
+                if (!d->m_pendingContacts.contains(contact->contact())) {
+                    beginRemoveRows(QModelIndex(), i, i);
+                    d->m_contacts.removeAt(i);
+                    d->m_contactMap.remove(contact->contact().id());
+                    endRemoveRows();
+                }
+            }
+
+            // now insert new contacts and move existing ones to their final positions
+            int count = d->m_pendingContacts.count();
+            for (int i = 0; i < count; ++i) {
+                QContact c = d->m_pendingContacts[i];
+                if (!d->m_contactMap.contains(c.id())) {
+                    QDeclarativeContact* dc = new QDeclarativeContact(this);
+                    dc->setContact(c);
+                    beginInsertRows(QModelIndex(), i, i);
+                    d->m_contacts.insert(i, dc);
+                    d->m_contactMap.insert(c.id(),dc);
+                    endInsertRows();
+                } else {
+                    QDeclarativeContact *contact = d->m_contactMap[c.id()];
+
+                    int pos = d->m_contacts.indexOf(contact);
+                    if (pos != i) {
+                        beginMoveRows(QModelIndex(), pos, pos, QModelIndex(), i);
+                        d->m_contacts.move(pos, i);
+                        endMoveRows();
+                    }
+                }
+            }
+            emit contactsChanged();
+        }
+
+        // and now clear the pending contact list as the model is up-to-date
+        d->m_pendingContacts.clear();
+        d->m_pendingRequests.removeOne(req);
+        req->deleteLater();
     }
 }
 
@@ -1103,14 +1181,24 @@
                 if (d->m_contacts.at(i)->contactId() == contactIdString) {
                     QDeclarativeContact* dc = d->m_contacts.at(i);
                     dc->setContact(fetchedContact);
+
+                    // Since the contact can change the position due the sort order we need take care of it
+                    // First we need to remove it from previous position and notify the model about that
+                    beginRemoveRows(QModelIndex(), i, i);
+                    d->m_contactMap.remove(fetchedContact.id());
+                    d->m_contacts.removeAt(i);
+                    endRemoveRows();
+
+                    // Calculate the new position
                     int index = contactIndex(dc);
-                    d->m_contactMap.remove(fetchedContact.id());
-                    d->m_contacts.removeAt(i);
+                    // Notify the model about the new item position
+                    beginInsertRows(QModelIndex(), index, index);
                     d->m_contacts.insert(index, dc);
                     d->m_contactMap.insert(fetchedContact.id(),dc);
                     if (!contactsUpdated)
                         contactsUpdated = true;
-                    emit dataChanged(this->index(index), this->index(index), QVector<int>() << ContactRole);
+                    endInsertRows();
+
                     fetchedContactFound = true;
                     break;
                 }
@@ -1156,7 +1244,6 @@
     return d->m_contacts.size();
 }
 
-
 #include "moc_qdeclarativecontactmodel_p.cpp"
 
 QT_END_NAMESPACE_CONTACTS

=== modified file 'src/imports/contacts/qdeclarativecontactmodel_p.h'
--- src/imports/contacts/qdeclarativecontactmodel_p.h	2013-06-05 15:45:28 +0000
+++ src/imports/contacts/qdeclarativecontactmodel_p.h	2013-08-29 11:23:11 +0000
@@ -178,6 +178,7 @@
     void clearContacts();
     void fetchAgain();
     void requestUpdated();
+    void fetchRequestStateChanged(QContactAbstractRequest::State newState);
     void doUpdate();
     void onRequestStateChanged(QContactAbstractRequest::State newState);
     void onContactsAdded(const QList<QContactId>& ids);

=== modified file 'tests/auto/contacts/qcontact/tst_qcontact.cpp'
--- tests/auto/contacts/qcontact/tst_qcontact.cpp	2013-07-25 18:41:12 +0000
+++ tests/auto/contacts/qcontact/tst_qcontact.cpp	2013-08-29 11:23:11 +0000
@@ -71,7 +71,7 @@
     void idTraits();
     void equality();
     void inequality();
-    void prefferedDetails();
+    void preferredDetails();
 };
 
 tst_QContact::tst_QContact()
@@ -708,7 +708,7 @@
     QVERIFY(one != two);
 }
 
-void tst_QContact::prefferedDetails()
+void tst_QContact::preferredDetails()
 {
     QContactPhoneNumber number;
     number.setNumber("7654321");