diff options
| author | Adam Treat <adam.treat@qt.io> | 2017-12-02 10:36:12 -0500 |
|---|---|---|
| committer | Adam Treat <adam.treat@qt.io> | 2018-02-08 01:28:41 +0000 |
| commit | 36171af399e24095a0836e05a519a19e161a278e (patch) | |
| tree | f44d3d4e981267a3d24a9238f197481f3f079dcb /src/plugins/platforms/qnx/qqnxscreen.h | |
| parent | ce8e72d04012620d8243bfa38db087b5194b68c4 (diff) | |
Make use of our egl convenience code for QNX QPA
This fixes various problems that occur because the current egl context
assumes OpenGL ES 2.0 and does not support newer versions of ES.
Task-number: QTBUG-64306
Change-Id: I81466ba5cf028b47ca5a2ebcdc702167aff655a2
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
Diffstat (limited to 'src/plugins/platforms/qnx/qqnxscreen.h')
| -rw-r--r-- | src/plugins/platforms/qnx/qqnxscreen.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/platforms/qnx/qqnxscreen.h b/src/plugins/platforms/qnx/qqnxscreen.h index 8a498434aa..a6d5623d04 100644 --- a/src/plugins/platforms/qnx/qqnxscreen.h +++ b/src/plugins/platforms/qnx/qqnxscreen.h @@ -49,10 +49,14 @@ #include <screen/screen.h> -// For pre-7.0 SDPs, map some screen property names to the old +#if !defined(_SCREEN_VERSION) +#define _SCREEN_MAKE_VERSION(major, minor, patch) (((major) * 10000) + ((minor) * 100) + (patch)) +#define _SCREEN_VERSION _SCREEN_MAKE_VERSION(0, 0, 0) +#endif + +// For pre-1.0.0 screen, map some screen property names to the old // names. -#include <sys/neutrino.h> -#if _NTO_VERSION < 700 +#if _SCREEN_VERSION < _SCREEN_MAKE_VERSION(1, 0, 0) const int SCREEN_PROPERTY_FLAGS = SCREEN_PROPERTY_KEY_FLAGS; const int SCREEN_PROPERTY_FOCUS = SCREEN_PROPERTY_KEYBOARD_FOCUS; const int SCREEN_PROPERTY_MODIFIERS = SCREEN_PROPERTY_KEY_MODIFIERS; |