Mercurial > octave
changeset 25886:d3f5d021255d
Allow building with Qt4 again (bug #49053)
* Figure.cc: don't include QWindow.h when we know it is not present
| author | Pantxo Diribarne <pantxo.diribarne@gmail.com> |
|---|---|
| date | Mon, 17 Sep 2018 20:15:27 +0200 |
| parents | 75ed70a1c108 |
| children | ad3417a54be6 6109f302cf43 |
| files | libgui/graphics/Figure.cc |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libgui/graphics/Figure.cc Mon Sep 17 10:52:07 2018 -0700 +++ b/libgui/graphics/Figure.cc Mon Sep 17 20:15:27 2018 +0200 @@ -41,8 +41,10 @@ #include <QtDebug> #include <QTimer> #include <QToolBar> -#include <QWindow> -#include <QScreen> +#if defined (HAVE_QSCREEN_DEVICEPIXELRATIO) +# include <QWindow> +# include <QScreen> +#endif #include "Canvas.h" #include "Container.h"