diff options
| author | Raphael Kubo da Costa <rakuco@FreeBSD.org> | 2014-02-08 18:14:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-10 10:47:57 +0100 |
| commit | a093204f07f276bc8e7b4fedf4af0e1369f55734 (patch) | |
| tree | d18b18fb37e1c2f91b5527bc7dc5a6a4a6a699d6 /src | |
| parent | f7308e007e1a833701aab2c109a906c28fd84832 (diff) | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/platformsupport/eglconvenience/qeglconvenience.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/platformsupport/eglconvenience/qeglconvenience.cpp b/src/platformsupport/eglconvenience/qeglconvenience.cpp index f51e471560..e561a6bc55 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 |