3
0
Fork 0
forked from mirrors/nixpkgs

x2goclient: fix build with qt 5.11

This commit is contained in:
Averell Dalton 2018-06-22 17:32:07 +02:00
parent 25ee8e0f70
commit 67e13d60c4
2 changed files with 18 additions and 1 deletions

View file

@ -14,7 +14,9 @@ stdenv.mkDerivation rec {
qtbase qtsvg qtx11extras qttools phonon ];
nativeBuildInputs = [ makeWrapper ];
patchPhase = ''
patches = [ ./qt511.patch ];
postPatch = ''
substituteInPlace Makefile \
--replace "SHELL=/bin/bash" "SHELL=$SHELL" \
--replace "lrelease-qt4" "${qttools.dev}/bin/lrelease" \

View file

@ -0,0 +1,15 @@
diff --git a/src/printwidget.cpp b/src/printwidget.cpp
index 58a8af7..131d340 100644
--- a/src/printwidget.cpp
+++ b/src/printwidget.cpp
@@ -23,6 +23,7 @@
#include "x2gosettings.h"
#include "x2gologdebug.h"
#include <QDir>
+#include <QButtonGroup>
#ifdef Q_OS_WIN
#include "wapi.h"
#endif
--
2.17.1