Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[buteo-sync-plugins-social] Don't link against QtGui. Contributes to …
…JB#36025

Most sync plugins don't need to link against QtGui, so remove that
linkage from the common.pri.  Only those plugins which use QImage
need to link against QtGui.
  • Loading branch information
Chris Adams committed Jan 30, 2019
1 parent 78e6fc8 commit 3b25bd5
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion rpm/sociald.spec
Expand Up @@ -7,7 +7,6 @@ License: LGPLv2.1
URL: https://bitbucket.org/jolla/base-sociald
Source0: %{name}-%{version}.tar.bz2
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Sql)
BuildRequires: pkgconfig(Qt5Network)
Expand Down Expand Up @@ -68,6 +67,7 @@ systemctl-user try-restart msyncd.service || :
Summary: Provides contact synchronisation with Facebook
License: LGPLv2.1
Group: System/Libraries
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Contacts)
BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions)
Requires: %{name} = %{version}-%{release}
Expand Down Expand Up @@ -174,6 +174,7 @@ systemctl-user try-restart msyncd.service || :
Summary: Provides contact synchronisation with Google
License: LGPLv2.1
Group: System/Libraries
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Contacts)
BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions) >= 0.1.58
Requires: %{name} = %{version}-%{release}
Expand Down Expand Up @@ -504,6 +505,7 @@ systemctl-user restart msyncd.service || :
Summary: Provides contact synchronisation with VK
License: LGPLv2.1
Group: System/Libraries
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Contacts)
BuildRequires: pkgconfig(qtcontacts-sqlite-qt5-extensions)
Requires: %{name} = %{version}-%{release}
Expand Down
3 changes: 3 additions & 0 deletions src/common.pri
Expand Up @@ -12,6 +12,9 @@ QT += \
dbus \
sql

QT -= \
gui

# the unit tests need to provide a custom QNAM and uses a different database directory
HEADERS += $$PWD/common/socialdnetworkaccessmanager_p.h
!contains(DEFINES, 'SOCIALD_TEST_DEFINE') {
Expand Down
1 change: 1 addition & 0 deletions src/facebook/facebook-contacts/facebook-contacts.pri
@@ -1,3 +1,4 @@
QT += gui
CONFIG += link_pkgconfig
PKGCONFIG += Qt5Contacts qtcontacts-sqlite-qt5-extensions
SOURCES += $$PWD/facebookcontactsyncadaptor.cpp
Expand Down
2 changes: 1 addition & 1 deletion src/google/google-contacts/google-contacts.pri
@@ -1,6 +1,6 @@
CONFIG += link_pkgconfig
PKGCONFIG += Qt5Contacts qtcontacts-sqlite-qt5-extensions
QT += contacts-private
QT += contacts-private gui

SOURCES += \
$$PWD/googletwowaycontactsyncadaptor.cpp \
Expand Down
2 changes: 1 addition & 1 deletion src/vk/vk-contacts/vk-contacts.pri
@@ -1,6 +1,6 @@
CONFIG += link_pkgconfig
PKGCONFIG += Qt5Contacts qtcontacts-sqlite-qt5-extensions
QT += contacts-private
QT += contacts-private gui
SOURCES += $$PWD/vkcontactsyncadaptor.cpp $$PWD/vkcontactimagedownloader.cpp
HEADERS += $$PWD/vkcontactsyncadaptor.h $$PWD/vkcontactimagedownloader.h
INCLUDEPATH += $$PWD
Expand Down

0 comments on commit 3b25bd5

Please sign in to comment.