Merge branch 'jb51507' into 'master'

Allow sync to continue on delete event error See merge request mer-core/buteo-sync-plugins-social!73
sailfishos · Dec 3, 2020 · fb86a0f · fb86a0f
2 parents 19021b6 + d7ad851
commit fb86a0f
Show file tree

Hide file tree

Showing 3 changed files with 473 additions and 412 deletions.
diff --git a/src/google/google-calendars/google-calendars.pri b/src/google/google-calendars/google-calendars.pri
@@ -1,6 +1,9 @@
 CONFIG += link_pkgconfig
 PKGCONFIG += libmkcal-qt5 libkcalcoren-qt5
-SOURCES += $$PWD/googlecalendarsyncadaptor.cpp
-HEADERS += $$PWD/googlecalendarsyncadaptor.h $$PWD/googlecalendarincidencecomparator.h
+SOURCES += \
+    $$PWD/googlecalendarsyncadaptor.cpp
+HEADERS += \
+    $$PWD/googlecalendarsyncadaptor.h \
+    $$PWD/googlecalendarincidencecomparator.h
 INCLUDEPATH += $$PWD