diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2016-03-11 15:05:56 +0100 |
|---|---|---|
| committer | Rolland Dudemaine <rolland@ghs.com> | 2016-04-13 08:14:40 +0000 |
| commit | 9b35b0e8dc6069aed563d0aca61c973eb307d772 (patch) | |
| tree | 91424c7b5d705677945b7a2e408c979df389477d /config.tests/qpa | |
| parent | 2687eb5a8c1495413dabb38750f0b6e8d93771e2 (diff) | |
Make the eglfs and eglfs-viv detection and build work for INTEGRITY.
The majority of these changes is about #ifdef-ing the Linux-specific use
of /dev/fb0.
The display handle is also acquired using fbGetDisplay(), which is
equivalent to fbGetDisplayByIndex(0) but is also portable.
Change-Id: I6f460edc9c06ae7461a6aab2a816ac6f645208c4
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
Diffstat (limited to 'config.tests/qpa')
| -rw-r--r-- | config.tests/qpa/eglfs-viv/eglfs-viv.cpp | 2 | ||||
| -rw-r--r-- | config.tests/qpa/eglfs-viv/eglfs-viv.pro | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp index 4b08322d66..a41c482b67 100644 --- a/config.tests/qpa/eglfs-viv/eglfs-viv.cpp +++ b/config.tests/qpa/eglfs-viv/eglfs-viv.cpp @@ -43,6 +43,6 @@ int main(int, char **) { - fbGetDisplayByIndex(0); + fbGetDisplay(); return 0; } diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.pro b/config.tests/qpa/eglfs-viv/eglfs-viv.pro index 99776940ec..3b36dc533f 100644 --- a/config.tests/qpa/eglfs-viv/eglfs-viv.pro +++ b/config.tests/qpa/eglfs-viv/eglfs-viv.pro @@ -1,6 +1,16 @@ SOURCES = eglfs-viv.cpp -DEFINES += LINUX=1 EGL_API_FB=1 - +integrity { + DEFINES += EGL_API_FB=1 +} else { + DEFINES += LINUX=1 EGL_API_FB=1 +} CONFIG -= qt LIBS += -lEGL -lGLESv2 -lGAL + +for(p, QMAKE_LIBDIR_OPENGL_ES2) { + exists($$p):LIBS += -L$$p +} + +!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL +!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL |