diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-08-04 13:14:48 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-08-04 13:23:22 +0200 |
commit | 8bd79c7d37bc5dc72e9fffb43e01bd7ddc93b94f (patch) | |
tree | 12d855187952755b374dab0378129039c67ca185 /src/hardwareintegration/client | |
parent | a147fedc76c84d2a6b50820a685288efb43f80db (diff) | |
parent | 19cdda76e8e1803c3c36252088e2f8d756e7cbea (diff) |
Merge remote-tracking branch 'qt/5.7' into dev
Change-Id: Ib22055ac52c0bb36081242948c72332db4e5ac64
Diffstat (limited to 'src/hardwareintegration/client')
4 files changed, 5 insertions, 2 deletions
diff --git a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h index d513eefa3..d528b2327 100644 --- a/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h +++ b/src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h @@ -73,7 +73,7 @@ public: bool isSharing() const Q_DECL_OVERRIDE; bool isValid() const Q_DECL_OVERRIDE; - void (*getProcAddress(const char *procName)) () Q_DECL_OVERRIDE; + QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; } diff --git a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri index 4435f481b..52653c4ae 100644 --- a/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri +++ b/src/hardwareintegration/client/xcomposite-egl/xcomposite-egl.pri @@ -8,6 +8,7 @@ include($$PWD/../xcomposite_share/xcomposite_share.pri) LIBS += -lXcomposite -lX11 } +QT += platformsupport-private CONFIG += egl SOURCES += \ diff --git a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h index eff75f292..862ed928b 100644 --- a/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h +++ b/src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h @@ -64,7 +64,7 @@ public: bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; void doneCurrent() Q_DECL_OVERRIDE; - void (*getProcAddress(const char *procName)) () Q_DECL_OVERRIDE; + QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; private: GLXContext m_context; diff --git a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri index 3ecf5e7cb..11c051728 100644 --- a/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri +++ b/src/hardwareintegration/client/xcomposite-glx/xcomposite-glx.pri @@ -8,6 +8,8 @@ include ($$PWD/../xcomposite_share/xcomposite_share.pri) LIBS += -lXcomposite -lGL -lX11 } +QT += platformsupport-private + SOURCES += \ $$PWD/qwaylandxcompositeglxcontext.cpp \ $$PWD/qwaylandxcompositeglxintegration.cpp \ |