[qtcontacts-sqlite] Don't link against QtGui unnecessarily. Contribut…

…es to JB#36025
sailfishos · Dec 11, 2018 · af621b0 · af621b0
1 parent babb97a
commit af621b0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 5 deletions.
diff --git a/rpm/qtcontacts-sqlite-qt5.spec b/rpm/qtcontacts-sqlite-qt5.spec
@@ -7,7 +7,6 @@ License: BSD
 URL: https://git.merproject.org/mer-core/qtcontacts-sqlite
 Source0: %{name}-%{version}.tar.gz
 BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5Gui)
 BuildRequires: pkgconfig(Qt5Sql)
 BuildRequires: pkgconfig(Qt5DBus)
 BuildRequires: pkgconfig(Qt5Contacts)

diff --git a/src/engine/contactsdatabase.cpp b/src/engine/contactsdatabase.cpp
@@ -36,7 +36,7 @@
 
 #include <QContactGender>
 
-#include <QDesktopServices>
+#include <QStandardPaths>
 #include <QDir>
 #include <QElapsedTimer>
 #include <QFile>

diff --git a/src/engine/engine.pro b/src/engine/engine.pro
@@ -3,7 +3,7 @@ include(../../config.pri)
 TEMPLATE = lib
 TARGET = qtcontacts_sqlite
 
-QT += sql dbus
+QT = core sql dbus
 
 CONFIG += plugin hide_symbols
 PLUGIN_TYPE=contacts

diff --git a/tests/benchmarks/deltadetection/deltadetection.pro b/tests/benchmarks/deltadetection/deltadetection.pro
@@ -3,7 +3,9 @@ include(../../../config.pri)
 TEMPLATE = app
 TARGET = deltadetection
 
-QT += testlib
+QT = \
+    core \
+    testlib
 
 SOURCES = main.cpp deltasyncadapter.cpp
 HEADERS = deltasyncadapter.h ../../../src/extensions/contactmanagerengine.h

diff --git a/tests/benchmarks/fetchtimes/fetchtimes.pro b/tests/benchmarks/fetchtimes/fetchtimes.pro
@@ -3,6 +3,8 @@ include(../../../config.pri)
 TEMPLATE = app
 TARGET = fetchtimes
 
+QT = core
+
 SOURCES = main.cpp
 
 target.path = /opt/tests/qtcontacts-sqlite-qt5

diff --git a/tests/common.pri b/tests/common.pri
@@ -1,6 +1,8 @@
 include(../config.pri)
 
-QT += testlib
+QT = \
+    core \
+    testlib
 TEMPLATE = app
 CONFIG -= app_bundle