diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 10:40:10 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 10:40:10 +0100 |
| commit | c76a1716a3e51a9fac78377890ea0161a9658344 (patch) | |
| tree | 6d65c1f5c55f7b139aa2a3222847963edd379534 /src/client/qwaylandnativeinterface.cpp | |
| parent | acd10cd393abe04a8fd6fe3ab14055e09c85bc15 (diff) | |
| parent | f7a386eeaec8e6314c1be7de5e14e9fe3847f9ba (diff) | |
Merge remote-tracking branch 'qt/5.6' into 5.7
Change-Id: I1efd16d6c5f939d61001376c3b010eae1927595b
Diffstat (limited to 'src/client/qwaylandnativeinterface.cpp')
| -rw-r--r-- | src/client/qwaylandnativeinterface.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/client/qwaylandnativeinterface.cpp b/src/client/qwaylandnativeinterface.cpp index bad64204b..2c87bb9f6 100644 --- a/src/client/qwaylandnativeinterface.cpp +++ b/src/client/qwaylandnativeinterface.cpp @@ -115,6 +115,7 @@ void *QWaylandNativeInterface::nativeResourceForScreen(const QByteArray &resourc return NULL; } +#ifndef QT_NO_OPENGL void *QWaylandNativeInterface::nativeResourceForContext(const QByteArray &resource, QOpenGLContext *context) { QByteArray lowerCaseResource = resource.toLower(); @@ -130,6 +131,7 @@ void *QWaylandNativeInterface::nativeResourceForContext(const QByteArray &resour return 0; } +#endif // QT_NO_OPENGL QVariantMap QWaylandNativeInterface::windowProperties(QPlatformWindow *window) const { |