diff options
Diffstat (limited to 'config.tests/qpa')
-rw-r--r-- | config.tests/qpa/egl-x11/egl-x11.pro | 2 | ||||
-rw-r--r-- | config.tests/qpa/egl/egl.pro | 2 | ||||
-rw-r--r-- | config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 2 | ||||
-rw-r--r-- | config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro | 2 | ||||
-rw-r--r-- | config.tests/qpa/eglfs-viv/eglfs-viv.cpp | 2 | ||||
-rw-r--r-- | config.tests/qpa/eglfs-viv/eglfs-viv.pro | 14 |
6 files changed, 17 insertions, 7 deletions
diff --git a/config.tests/qpa/egl-x11/egl-x11.pro b/config.tests/qpa/egl-x11/egl-x11.pro index c4e94ca40c..aceb03dd78 100644 --- a/config.tests/qpa/egl-x11/egl-x11.pro +++ b/config.tests/qpa/egl-x11/egl-x11.pro @@ -1,7 +1,7 @@ SOURCES = egl-x11.cpp for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL diff --git a/config.tests/qpa/egl/egl.pro b/config.tests/qpa/egl/egl.pro index f04d053543..b5396dab15 100644 --- a/config.tests/qpa/egl/egl.pro +++ b/config.tests/qpa/egl/egl.pro @@ -1,7 +1,7 @@ SOURCES = egl.cpp for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro index ce16a3a391..d8b1c3ec7e 100644 --- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro +++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro @@ -5,7 +5,7 @@ CONFIG -= qt INCLUDEPATH += $$QMAKE_INCDIR_EGL for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } LIBS += -lEGL -lGLESv2 -lbcm_host diff --git a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro index 87214abc7a..521a911219 100644 --- a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro +++ b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro @@ -1,7 +1,7 @@ SOURCES = eglfs-egldevice.cpp for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } INCLUDEPATH += $$QMAKE_INCDIR_EGL 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 |