AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EGL convenience: Guard Linux-specific code with Q_OS_LINUX.

Browse Source 
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>
This commit is contained in:
Raphael Kubo da Costa 2014-02-08 18:14:33 +02:00 committed by The Qt Project
parent f7308e007e
commit a093204f07
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/platformsupport/eglconvenience/qeglconvenience.cpp
View File

@ -41,7 +41,7 @@
#include <QByteArray> #include <QByteArray>
#if (defined(Q_OS_UNIX) && !defined(Q_OS_QNX)) #ifdef Q_OS_LINUX
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <linux/fb.h> #include <linux/fb.h>
#include <private/qmath_p.h> #include <private/qmath_p.h>
@ -433,7 +433,7 @@ void q_printEglConfig(EGLDisplay display, EGLConfig config)
qWarning("\n"); qWarning("\n");
} }
#if (defined(Q_OS_UNIX) && !defined(Q_OS_QNX)) #ifdef Q_OS_LINUX
QSizeF q_physicalScreenSizeFromFb(int framebufferDevice, const QSize &screenSize) QSizeF q_physicalScreenSizeFromFb(int framebufferDevice, const QSize &screenSize)
{ {
@ -535,6 +535,6 @@ int q_screenDepthFromFb(int framebufferDevice)
return depth; return depth;
} }
#endif // Q_OS_UNIX #endif // Q_OS_LINUX
QT_END_NAMESPACE QT_END_NAMESPACE