Commit 98eae9d2 authored by chriadam's avatar chriadam

Merge branch 'jb36025' into 'master'

[buteo-sync-plugins-social] Don't link against QtGui. Contributes to JB#36025

See merge request !32
parents 78e6fc8c 3b25bd5a
...@@ -7,7 +7,6 @@ License: LGPLv2.1 ...@@ -7,7 +7,6 @@ License: LGPLv2.1
URL: https://bitbucket.org/jolla/base-sociald URL: https://bitbucket.org/jolla/base-sociald
Source0: %{name}-%{version}.tar.bz2 Source0: %{name}-%{version}.tar.bz2
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Network)
...@@ -68,6 +67,7 @@ systemctl-user try-restart msyncd.service || : ...@@ -68,6 +67,7 @@ systemctl-user try-restart msyncd.service || :
Summary: Provides contact synchronisation with Facebook Summary: Provides contact synchronisation with Facebook
License: LGPLv2.1 License: LGPLv2.1
Group: System/Libraries Group: System/Libraries
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Contacts) BuildRequires: pkgconfig(Qt5Contacts)
BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions) BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions)
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
...@@ -174,6 +174,7 @@ systemctl-user try-restart msyncd.service || : ...@@ -174,6 +174,7 @@ systemctl-user try-restart msyncd.service || :
Summary: Provides contact synchronisation with Google Summary: Provides contact synchronisation with Google
License: LGPLv2.1 License: LGPLv2.1
Group: System/Libraries Group: System/Libraries
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Contacts) BuildRequires: pkgconfig(Qt5Contacts)
BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions) >= 0.1.58 BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions) >= 0.1.58
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
...@@ -504,6 +505,7 @@ systemctl-user restart msyncd.service || : ...@@ -504,6 +505,7 @@ systemctl-user restart msyncd.service || :
Summary: Provides contact synchronisation with VK Summary: Provides contact synchronisation with VK
License: LGPLv2.1 License: LGPLv2.1
Group: System/Libraries Group: System/Libraries
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Contacts) BuildRequires: pkgconfig(Qt5Contacts)
BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions) BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions)
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
......
...@@ -12,6 +12,9 @@ QT += \ ...@@ -12,6 +12,9 @@ QT += \
dbus \ dbus \
sql sql
QT -= \
gui
# the unit tests need to provide a custom QNAM and uses a different database directory # the unit tests need to provide a custom QNAM and uses a different database directory
HEADERS += $$PWD/common/socialdnetworkaccessmanager_p.h HEADERS += $$PWD/common/socialdnetworkaccessmanager_p.h
!contains(DEFINES, 'SOCIALD_TEST_DEFINE') { !contains(DEFINES, 'SOCIALD_TEST_DEFINE') {
......
QT += gui
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += Qt5Contacts qtcontacts-sqlite-qt5-extensions PKGCONFIG += Qt5Contacts qtcontacts-sqlite-qt5-extensions
SOURCES += $$PWD/facebookcontactsyncadaptor.cpp SOURCES += $$PWD/facebookcontactsyncadaptor.cpp
......
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += Qt5Contacts qtcontacts-sqlite-qt5-extensions PKGCONFIG += Qt5Contacts qtcontacts-sqlite-qt5-extensions
QT += contacts-private QT += contacts-private gui
SOURCES += \ SOURCES += \
$$PWD/googletwowaycontactsyncadaptor.cpp \ $$PWD/googletwowaycontactsyncadaptor.cpp \
......
CONFIG += link_pkgconfig CONFIG += link_pkgconfig
PKGCONFIG += Qt5Contacts qtcontacts-sqlite-qt5-extensions PKGCONFIG += Qt5Contacts qtcontacts-sqlite-qt5-extensions
QT += contacts-private QT += contacts-private gui
SOURCES += $$PWD/vkcontactsyncadaptor.cpp $$PWD/vkcontactimagedownloader.cpp SOURCES += $$PWD/vkcontactsyncadaptor.cpp $$PWD/vkcontactimagedownloader.cpp
HEADERS += $$PWD/vkcontactsyncadaptor.h $$PWD/vkcontactimagedownloader.h HEADERS += $$PWD/vkcontactsyncadaptor.h $$PWD/vkcontactimagedownloader.h
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment