diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 2 | ||||
| -rw-r--r-- | src/opengl/opengl.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/platforms.pro | 4 | ||||
| -rw-r--r-- | src/tools/qdoc/doc/config/qt-defines.qdocconf | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index df3371b236..fe1c93ea29 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -512,6 +512,8 @@ static void init_platform(const QString &pluginArgument, const QString &platform const QString defaultPlatform = QLatin1String("xcb"); #elif !defined (QT_NO_WAYLAND) const QString defaultPlatform = QLatin1String("wayland"); +#elif !defined (QT_NO_EGLFS) + const QString defaultPlatform = QLatin1String("eglfs"); #else const QString defaultPlatform = QLatin1String("minimal"); #endif diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 89f8d0a3c2..b2b3790b29 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -72,6 +72,4 @@ SOURCES += qglshaderprogram.cpp \ SOURCES += qgl_qpa.cpp \ qglpixelbuffer_stub.cpp -DEFINES += QT_NO_EGL - INCLUDEPATH += ../3rdparty/harfbuzz/src diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro index c97c1def0c..692332291c 100644 --- a/src/plugins/platforms/platforms.pro +++ b/src/plugins/platforms/platforms.pro @@ -15,3 +15,7 @@ win32: SUBDIRS += windows qnx-*-qcc { SUBDIRS += qnx } + +contains(QT_CONFIG, eglfs) { + SUBDIRS += eglfs +} diff --git a/src/tools/qdoc/doc/config/qt-defines.qdocconf b/src/tools/qdoc/doc/config/qt-defines.qdocconf index 50a355f04c..e11b32dc4c 100644 --- a/src/tools/qdoc/doc/config/qt-defines.qdocconf +++ b/src/tools/qdoc/doc/config/qt-defines.qdocconf @@ -3,7 +3,6 @@ defines = Q_QDOC \ QT_.*_LIB \ QT_COMPAT \ QT_KEYPAD_NAVIGATION \ - QT_NO_EGL \ QT3_SUPPORT \ Q_WS_.* \ Q_OS_.* \ |