qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Oswald Buddenhagen 2016-08-13 22:37:15 +02:00
parent 492d7d14fc
commit d175f799ca
4 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config.tests/qpa/eglfs-egldevice/eglfs-egldevice.cpp
View File

@ -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/egl.h>
#include <EGL/eglext.h> #include <EGL/eglext.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
int main(int, char **) int main(int, char **)
{ {
EGLDeviceEXT device = 0; EGLDeviceEXT device = 0;
EGLStreamKHR stream = 0; EGLStreamKHR stream = 0;
EGLOutputLayerEXT layer = 0; EGLOutputLayerEXT layer = 0;
drmModeCrtcPtr currentMode = drmModeGetCrtc(0, 0);
return EGL_DRM_CRTC_EXT; return EGL_DRM_CRTC_EXT;
} }

6
config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
View File

@ -6,10 +6,4 @@ for(p, QMAKE_LIBDIR_EGL) {
INCLUDEPATH += $$QMAKE_INCDIR_EGL INCLUDEPATH += $$QMAKE_INCDIR_EGL
LIBS += $$QMAKE_LIBS_EGL LIBS += $$QMAKE_LIBS_EGL
CONFIG += link_pkgconfig
!contains(QT_CONFIG, no-pkg-config) {
PKGCONFIG += libdrm
} else {
LIBS += -ldrm
}
CONFIG -= qt CONFIG -= qt

8
config.tests/qpa/kms/kms.pro
View File

@ -1,4 +1,8 @@
SOURCES = kms.cpp SOURCES = kms.cpp
CONFIG += link_pkgconfig !contains(QT_CONFIG, no-pkg-config) {
PKGCONFIG += libdrm CONFIG += link_pkgconfig
PKGCONFIG += libdrm
} else {
LIBS += -ldrm
}
CONFIG -= qt CONFIG -= qt

2
configure.json
View File

@ -1863,7 +1863,7 @@
}, },
"eglfs_egldevice": { "eglfs_egldevice": {
"description": "EGLFS EGLDevice", "description": "EGLFS EGLDevice",
"condition": "features.eglfs && tests.egl-egldevice", "condition": "features.eglfs && tests.egl-egldevice && features.kms",
"output": [ "publicQtConfig" ] "output": [ "publicQtConfig" ]
}, },
"eglfs_gbm": { "eglfs_gbm": {