diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-13 22:37:15 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-18 17:09:43 +0000 |
| commit | d175f799cafb78237e0eae55294c3cd9d6cbd9bc (patch) | |
| tree | 10e16f0ca0ca1677920971d5810b035ec50b105d /config.tests/qpa | |
| parent | 492d7d14fc813a858fa98ae048137a6b45155db0 (diff) | |
don't implicitly test for kms in egldevice test any more
having compound tests is messy, and we already have a separate test for
that anyway.
the kms test itself gains a fallback library, as that's what both the
egldevice test did and the actual projects using kms do.
Change-Id: I4544b64de86d58d6c6449bc0ad9095acaf144056
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'config.tests/qpa')
| -rw-r--r-- | config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp | 10 | ||||
| -rw-r--r-- | config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro | 6 | ||||
| -rw-r--r-- | config.tests/qpa/kms/kms.pro | 8 |
3 files changed, 6 insertions, 18 deletions
diff --git a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp index a2d69905e5..fa3e9d33f7 100644 --- a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp +++ b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp @@ -37,23 +37,13 @@ ** ****************************************************************************/ -// Test both EGLDevice/Output/Stream and DRM as we only use them in combination. -// -// Other KMS/DRM tests relying on pkgconfig for libdrm are not suitable since -// some systems do not use pkgconfig for the graphics stuff. - -#include <stdlib.h> -#include <stdint.h> #include <EGL/egl.h> #include <EGL/eglext.h> -#include <xf86drm.h> -#include <xf86drmMode.h> int main(int, char **) { EGLDeviceEXT device = 0; EGLStreamKHR stream = 0; EGLOutputLayerEXT layer = 0; - drmModeCrtcPtr currentMode = drmModeGetCrtc(0, 0); return EGL_DRM_CRTC_EXT; } diff --git a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro index d0945465a0..0bb8c66cb1 100644 --- a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro +++ b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro @@ -6,10 +6,4 @@ for(p, QMAKE_LIBDIR_EGL) { INCLUDEPATH += $$QMAKE_INCDIR_EGL LIBS += $$QMAKE_LIBS_EGL -CONFIG += link_pkgconfig -!contains(QT_CONFIG, no-pkg-config) { - PKGCONFIG += libdrm -} else { - LIBS += -ldrm -} CONFIG -= qt diff --git a/config.tests/qpa/kms/kms.pro b/config.tests/qpa/kms/kms.pro index 5147bc82da..ff6b1f6299 100644 --- a/config.tests/qpa/kms/kms.pro +++ b/config.tests/qpa/kms/kms.pro @@ -1,4 +1,8 @@ SOURCES = kms.cpp -CONFIG += link_pkgconfig -PKGCONFIG += libdrm +!contains(QT_CONFIG, no-pkg-config) { + CONFIG += link_pkgconfig + PKGCONFIG += libdrm +} else { + LIBS += -ldrm +} CONFIG -= qt |