Merge branch 'jb36025' into 'master'

[libcontentaction] Don't link against QtGui unnecessarily. Contributes to JB#36025 See merge request mer-core/libcontentaction!8
sailfishos · Jan 7, 2019 · 4f28a1b · 4f28a1b
2 parents 7cee760 + 15c65ed
commit 4f28a1b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/rpm/libcontentaction-qt5.spec b/rpm/libcontentaction-qt5.spec
@@ -11,7 +11,6 @@ Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(mlite5)
 BuildRequires:  pkgconfig(Qt5Core)
-BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Test)
 BuildRequires:  pkgconfig(Qt5Xml)

diff --git a/tools/tools.pro b/tools/tools.pro
@@ -3,6 +3,8 @@ SOURCES += lca-tool.cpp
 target.path = /usr/bin
 INSTALLS += target
 
+QT = core
+
 CONFIG += link_pkgconfig
 PKGCONFIG += gio-2.0 gio-unix-2.0
 DEFINES += QT_NO_KEYWORDS # make glib happy