diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-09 13:07:26 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2021-09-17 17:30:14 +0200 |
| commit | 7a4b586f4b8d1b73d1af3d24ff5112e4dc231ea6 (patch) | |
| tree | fddc569efaeeb8147b80c0d7c3aae60f5c623fd7 /src/plugins/platforms/eglfs/api/qeglfswindow.cpp | |
| parent | d8fd2425fb37b5f745e385552b11dc4cdcffb5ff (diff) | |
Remove conditioning on Android embedded
It is no longer handled separately from Android.
This effectively reverts commit 6d50f746fe05a7008b63818e77784dd0c99270a1
Change-Id: Ic2d75b8c5a09895810913311ab2fe3355d4d2983
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/plugins/platforms/eglfs/api/qeglfswindow.cpp')
| -rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfswindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/platforms/eglfs/api/qeglfswindow.cpp b/src/plugins/platforms/eglfs/api/qeglfswindow.cpp index 2ee237ec28..b1fdba5a46 100644 --- a/src/plugins/platforms/eglfs/api/qeglfswindow.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfswindow.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the plugins of the Qt Toolkit. @@ -111,11 +111,11 @@ void QEglFSWindow::create() QOpenGLCompositor *compositor = QOpenGLCompositor::instance(); if (screen->primarySurface() != EGL_NO_SURFACE) { if (Q_UNLIKELY(!isRaster() || !compositor->targetWindow())) { -#if !defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID_EMBEDDED) +# ifndef Q_OS_ANDROID // We can have either a single OpenGL window or multiple raster windows. // Other combinations cannot work. qFatal("EGLFS: OpenGL windows cannot be mixed with others."); -#endif +# endif return; } m_format = compositor->targetWindow()->format(); |