[buteo-sync-plugins-social] Update Google Contacts plugin to work wit…

…h latest QtPim. JB#50552 - Implement the TwoWayContactSyncAdaptor interface - Remove OOB usage (no longer necessary to store data out-of-band) - Use a collection specific to the account, instead of a sync target - Remove old clean-up code path for stale contact avatars
sailfishos · Sep 25, 2020 · 1ffb34d · 1ffb34d
1 parent add5e49
commit 1ffb34d
Show file tree

Hide file tree

Showing 4 changed files with 521 additions and 585 deletions.
diff --git a/src/common.pri b/src/common.pri
@@ -43,6 +43,11 @@ contains(DEFINES, 'SOCIALD_USE_QTPIM') {
     DEFINES *= USE_CONTACTS_NAMESPACE=QTCONTACTS_USE_NAMESPACE
     PKGCONFIG += Qt5Contacts qtcontacts-sqlite-qt5-extensions
     HEADERS += $$PWD/common/constants_p.h
+
+    # We need the moc output for ContactManagerEngine from sqlite-extensions
+    extensionsIncludePath = $$system(pkg-config --cflags-only-I qtcontacts-sqlite-qt5-extensions)
+    VPATH += $$replace(extensionsIncludePath, -I, )
+    HEADERS += contactmanagerengine.h
 }
 
 # don't pull in buteo plugin framework for unit test builds

diff --git a/src/google/google-contacts/googlecontactstream.h b/src/google/google-contacts/googlecontactstream.h
@@ -35,7 +35,6 @@
 
 #include <QContact>
 #include <QContactDetail>
-#include <QContactSyncTarget>
 #include <QContactName>
 #include <QContactAddress>
 #include <QContactAnniversary>