yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[plugins/qpa] Adjust to changes in Qt 5.7 QPA interface

Browse source 
BUG: 360269
This commit is contained in:
Martin Gräßlin 2016-03-09 13:42:24 +01:00
parent 9fb71ef9a2
commit 7d08b08470
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/qpa/abstractplatformcontext.cpp
View file

@ -115,10 +115,17 @@ QSurfaceFormat AbstractPlatformContext::format() const
return m_format; return m_format;
} }
#if (QT_VERSION < QT_VERSION_CHECK(5, 7, 0))
QFunctionPointer AbstractPlatformContext::getProcAddress(const QByteArray &procName) QFunctionPointer AbstractPlatformContext::getProcAddress(const QByteArray &procName)
{ {
return eglGetProcAddress(procName.constData()); return eglGetProcAddress(procName.constData());
} }
#else
QFunctionPointer AbstractPlatformContext::getProcAddress(const char *procName)
{
return eglGetProcAddress(procName);
}
#endif
bool AbstractPlatformContext::isValid() const bool AbstractPlatformContext::isValid() const
{ {

4
plugins/qpa/abstractplatformcontext.h
View file

@ -39,7 +39,11 @@ public:
void doneCurrent() override; void doneCurrent() override;
QSurfaceFormat format() const override; QSurfaceFormat format() const override;
bool isValid() const override; bool isValid() const override;
#if (QT_VERSION < QT_VERSION_CHECK(5, 7, 0))
QFunctionPointer getProcAddress(const QByteArray &procName) override; QFunctionPointer getProcAddress(const QByteArray &procName) override;
#else
QFunctionPointer getProcAddress(const char *procName) override;
#endif
protected: protected:
EGLDisplay eglDisplay() const { EGLDisplay eglDisplay() const {