diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-03-16 18:41:27 +0100 |
| commit | ff922e7b87de147797fbd759167878aec7625f0c (patch) | |
| tree | a326819f23e2421723f144522f9362ba608d6bb1 /src/plugins/platforms/eglfs/api | |
| parent | e464e1eb8eb63c631fb0916c3ea4540a88d8aad3 (diff) | |
| parent | 75f52bd0ddc4afbd181c14b310d256e3507052d6 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
src/corelib/kernel/qmetatype.cpp
Change-Id: I88eb0d3e9c9a38abf7241a51e370c655ae74e38a
Diffstat (limited to 'src/plugins/platforms/eglfs/api')
| -rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp index e3145aa0b0..b985386a4e 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp @@ -185,7 +185,9 @@ void QEglFSDeviceIntegration::platformDestroy() EGLNativeDisplayType QEglFSDeviceIntegration::platformDisplay() const { - return EGL_DEFAULT_DISPLAY; + bool displayOk; + const int defaultDisplay = qEnvironmentVariableIntValue("QT_QPA_EGLFS_DEFAULT_DISPLAY", &displayOk); + return displayOk ? EGLNativeDisplayType(quintptr(defaultDisplay)) : EGL_DEFAULT_DISPLAY; } EGLDisplay QEglFSDeviceIntegration::createDisplay(EGLNativeDisplayType nativeDisplay) |