diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
| commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
| tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /config.tests/qpa/kms/kms.cpp | |
| parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
| parent | 281121697340084f7d385eab530f41916789b94d (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'config.tests/qpa/kms/kms.cpp')
| -rw-r--r-- | config.tests/qpa/kms/kms.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/config.tests/qpa/kms/kms.cpp b/config.tests/qpa/kms/kms.cpp index 64c11158c5..ac0c281386 100644 --- a/config.tests/qpa/kms/kms.cpp +++ b/config.tests/qpa/kms/kms.cpp @@ -32,17 +32,14 @@ ****************************************************************************/ #include <stdlib.h> +#include <stdint.h> extern "C" { -#include <gbm.h> #include <xf86drmMode.h> #include <xf86drm.h> } -#include <EGL/egl.h> -#include <GLES2/gl2.h> int main(int, char **) { - // Check for gbm_surface which is quite a recent addition. - gbm_surface *surface = 0; + drmModeCrtcPtr currentMode = drmModeGetCrtc(0, 0); return 0; } |