From 9c7879cd434141801d5324c3b468ca45f515f5d8 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 7 Sep 2018 14:12:12 +0200
Subject: [qt5core] Put common qt requirements in own module

---
 core/modules/pvs2/module.conf        | 6 +-----
 core/modules/pvs2/module.conf.ubuntu | 5 -----
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'core/modules/pvs2')

diff --git a/core/modules/pvs2/module.conf b/core/modules/pvs2/module.conf
index b3b97b7e..7d918d60 100644
--- a/core/modules/pvs2/module.conf
+++ b/core/modules/pvs2/module.conf
@@ -9,12 +9,8 @@ REQUIRED_BINARIES="
 REQUIRED_DIRECTORIES="
 	/opt/openslx/pvs2/
 "
-REQUIRED_LIBRARIES="
-	libqjpeg
-"
-REQUIRED_SYSTEM_FILES="
-"
 REQUIRED_MODULES="
+	qt5core
 	x11vnc
 "
 # TODO add libraries
diff --git a/core/modules/pvs2/module.conf.ubuntu b/core/modules/pvs2/module.conf.ubuntu
index 1391c073..83877b5a 100644
--- a/core/modules/pvs2/module.conf.ubuntu
+++ b/core/modules/pvs2/module.conf.ubuntu
@@ -1,17 +1,12 @@
 #!/bin/bash
 REQUIRED_INSTALLED_PACKAGES="
 	libxss-dev
-	libqt5gui5
-	libqt5svg5-dev
 	libqt5x11extras5-dev
-	qttools5-dev
-	qttools5-dev-tools
 	libvncserver-dev
 	xinput
 	wmctrl
 "
 REQUIRED_CONTENT_PACKAGES="
-	libqt5gui5
 	xinput
 	wmctrl
 "
-- 
cgit v1.2.3-55-g7522