From d175f799cafb78237e0eae55294c3cd9d6cbd9bc Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Date: Sat, 13 Aug 2016 22:37:15 +0200
Subject: 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>
---
 config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp | 10 ----------
 config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro |  6 ------
 config.tests/qpa/kms/kms.pro                         |  8 ++++++--
 3 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'config.tests/qpa')

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
-- 
cgit v1.2.3