diff options
| author | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2019-01-04 16:01:46 +0100 |
|---|---|---|
| committer | Mikhail Svetkin <mikhail.svetkin@qt.io> | 2019-01-27 21:01:53 +0000 |
| commit | 3b514f853595c686d4ed8830567c1f27ea533faf (patch) | |
| tree | d37c83df1382ed9060cb561f4272e54b65988c18 /src/plugins/platforms | |
| parent | fc585d38219bf7f0b26146519d590b65e204ea55 (diff) | |
qtlite: Fix build libs with -no-feature-regularexpression
Change-Id: I427ff1f8f4986fbf466aba60a9d3de614c1e006f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp index f151713400..0a3a37863a 100644 --- a/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp +++ b/src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp @@ -51,7 +51,9 @@ #include <private/qguiapplication_p.h> #include <QScreen> #include <QDir> -#include <QRegularExpression> +#if QT_CONFIG(regularexpression) +# include <QRegularExpression> +#endif #include <QLoggingCategory> #if defined(Q_OS_LINUX) diff --git a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp index ddb8f45188..d42a33c22b 100644 --- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp +++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp @@ -48,7 +48,9 @@ #undef register #include <GL/glx.h> -#include <QtCore/QRegularExpression> +#if QT_CONFIG(regularexpression) +# include <QtCore/QRegularExpression> +#endif #include <QtGui/QOpenGLContext> #include <QtGui/QOffscreenSurface> @@ -722,6 +724,7 @@ void QGLXContext::queryDummyContext() // The issue was fixed in Xcb 1.11, but we can't check for that // at runtime, so instead assume it fixed with recent Mesa versions // released several years after the Xcb fix. +#if QT_CONFIG(regularexpression) QRegularExpression versionTest(QStringLiteral("Mesa (\\d+)")); QRegularExpressionMatch result = versionTest.match(QString::fromLatin1(mesaVersionStr)); int versionNr = 0; @@ -731,6 +734,7 @@ void QGLXContext::queryDummyContext() // White-listed m_supportsThreading = true; } +#endif } if (!m_supportsThreading) { qCDebug(lcQpaGl).nospace() << "Multithreaded OpenGL disabled: " |