From a35e304b0dd4159b58b52639d59a9693d42ec545 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 16 Nov 2017 11:13:57 +0100 Subject: [*] qt4 -> qt5 --- core/modules/pvs2/module.conf | 1 - core/modules/pvs2/module.conf.ubuntu | 6 +++--- core/modules/pvs2/module.conf.ubuntu.17 | 13 +++++++++++++ 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 core/modules/pvs2/module.conf.ubuntu.17 (limited to 'core/modules/pvs2') diff --git a/core/modules/pvs2/module.conf b/core/modules/pvs2/module.conf index a9a57bfb..bbac8a80 100644 --- a/core/modules/pvs2/module.conf +++ b/core/modules/pvs2/module.conf @@ -8,7 +8,6 @@ REQUIRED_BINARIES=" " REQUIRED_DIRECTORIES=" /opt/openslx/pvs2/ - /usr/lib/ " REQUIRED_LIBRARIES=" " diff --git a/core/modules/pvs2/module.conf.ubuntu b/core/modules/pvs2/module.conf.ubuntu index 2a938b43..05a233bc 100644 --- a/core/modules/pvs2/module.conf.ubuntu +++ b/core/modules/pvs2/module.conf.ubuntu @@ -1,13 +1,13 @@ #!/bin/bash REQUIRED_INSTALLED_PACKAGES=" - libqt4-dev + libqt5gui5 + libqt5x11extras5-dev + qttools5-dev libvncserver-dev xinput wmctrl " REQUIRED_CONTENT_PACKAGES=" - libqt4-svg - libqtgui4 xinput wmctrl " diff --git a/core/modules/pvs2/module.conf.ubuntu.17 b/core/modules/pvs2/module.conf.ubuntu.17 new file mode 100644 index 00000000..19ab75f1 --- /dev/null +++ b/core/modules/pvs2/module.conf.ubuntu.17 @@ -0,0 +1,13 @@ +#!/bin/bash +REQUIRED_INSTALLED_PACKAGES=" + libqt5gui5 + libqt5x11extras5-dev + qttools5-dev-tools + libvncserver-dev + xinput + wmctrl +" +REQUIRED_CONTENT_PACKAGES=" + xinput + wmctrl +" -- cgit v1.2.3-55-g7522