changeset 4747:b84e8b43eb8f

stable-octave: fix build for current qt version
author John W. Eaton <jwe@octave.org>
date Thu, 28 Jun 2018 09:12:42 -0400
parents 48149133e0f0
children a6b4355efbd6
files dist-files.mk src/stable-octave-1-qt.patch
diffstat 2 files changed, 13 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/dist-files.mk	Wed Jun 27 16:28:22 2018 -0400
+++ b/dist-files.mk	Thu Jun 28 09:12:42 2018 -0400
@@ -675,6 +675,7 @@
   src-msys-zip.mk \
   src-msys-zlib.mk \
   stable-octave-1-gnulib.patch \
+  stable-octave-1-qt.patch \
   stable-octave.mk \
   suitesparse-1.patch \
   suitesparse.mk \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/stable-octave-1-qt.patch	Thu Jun 28 09:12:42 2018 -0400
@@ -0,0 +1,12 @@
+diff --git a/libgui/src/settings-dialog.cc b/libgui/src/settings-dialog.cc
+--- a/libgui/src/settings-dialog.cc
++++ b/libgui/src/settings-dialog.cc
+@@ -34,6 +34,8 @@ along with Octave; see the file COPYING.
+ #include "workspace-model.h"
+ #include "settings-dialog.h"
+ #include "ui-settings-dialog.h"
++
++#include <QButtonGroup>
+ #include <QDir>
+ #include <QFileInfo>
+ #include <QFileDialog>