From 0bdd795274a033a3f97b6d7d3b67c208fd5594fa Mon Sep 17 00:00:00 2001
From: Matt Vogt <matthew.vogt@jollamobile.com>
Date: Tue, 22 Jul 2014 13:45:57 +1000
Subject: [PATCH] [libcontacts] Remove formerly-unsupported types from
 exclusion list

QContactFamily and QContactGeoLocation types are now supported by the
qtcontacts-sqlite backend.
---
 src/seasideimport.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/seasideimport.cpp b/src/seasideimport.cpp
index 11f65d7..03b8377 100644
--- a/src/seasideimport.cpp
+++ b/src/seasideimport.cpp
@@ -45,6 +45,8 @@
 #include <QContactAvatar>
 #include <QContactBirthday>
 #include <QContactEmailAddress>
+#include <QContactFamily>
+#include <QContactGeoLocation>
 #include <QContactGuid>
 #include <QContactHobby>
 #include <QContactName>
@@ -255,6 +257,8 @@ bool mergeIntoExistingContact(QContact *updateContact, const QContact &importedC
     rv |= updateExistingDetails<QContactAvatar>(updateContact, importedContact);
     rv |= updateExistingDetails<QContactBirthday>(updateContact, importedContact, true);
     rv |= updateExistingDetails<QContactEmailAddress>(updateContact, importedContact);
+    rv |= updateExistingDetails<QContactFamily>(updateContact, importedContact);
+    rv |= updateExistingDetails<QContactGeoLocation>(updateContact, importedContact);
     rv |= updateExistingDetails<QContactGuid>(updateContact, importedContact);
     rv |= updateExistingDetails<QContactHobby>(updateContact, importedContact);
     rv |= updateExistingDetails<QContactNickname>(updateContact, importedContact);
@@ -314,8 +318,6 @@ QList<QContact> SeasideImport::buildImportContacts(const QList<QVersitDocument>
     QHash<QString, int> importLabels;
 
     QSet<QContactDetail::DetailType> unimportableDetailTypes;
-    unimportableDetailTypes.insert(QContactDetail::TypeFamily);
-    unimportableDetailTypes.insert(QContactDetail::TypeGeoLocation);
     unimportableDetailTypes.insert(QContactDetail::TypeGlobalPresence);
     unimportableDetailTypes.insert(QContactDetail::TypeVersion);