From a093204f07f276bc8e7b4fedf4af0e1369f55734 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Date: Sat, 8 Feb 2014 18:14:33 +0200
Subject: [PATCH] EGL convenience: Guard Linux-specific code with Q_OS_LINUX.
Instead of "blacklisting" Unix platforms that don't have Linux headers,
do the opposite and check for Q_OS_LINUX in the framebuffer code that
has Linux-specific code.
This should help fix the build on other Unices, such as the BSDs.
Change-Id: Icb6edf34bb20c9a98843b6dc0e2a87ee71fcd046
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
---
src/platformsupport/eglconvenience/qeglconvenience.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp
index f51e471560a..e561a6bc55c 100644
--- a/src/platformsupport/eglconvenience/qeglconvenience.cpp
+++ b/src/platformsupport/eglconvenience/qeglconvenience.cpp
@@ -41,7 +41,7 @@
#include <QByteArray>
-#if (defined(Q_OS_UNIX) && !defined(Q_OS_QNX))
+#ifdef Q_OS_LINUX
#include <sys/ioctl.h>
#include <linux/fb.h>
#include <private/qmath_p.h>
@@ -433,7 +433,7 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
qWarning("\n");
}
-#if (defined(Q_OS_UNIX) && !defined(Q_OS_QNX))
+#ifdef Q_OS_LINUX
QSizeF q_physicalScreenSizeFromFb(int framebufferDevice, const QSize &screenSize)
{
@@ -535,6 +535,6 @@ int q_screenDepthFromFb(int framebufferDevice)
return depth;
}
-#endif // Q_OS_UNIX
+#endif // Q_OS_LINUX
QT_END_NAMESPACE
--
GitLab