diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-04-14 13:48:36 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-04-14 13:48:36 (GMT) |
| commit | c7537e30ba4698b52d90b68875af16285785bf70 (patch) | |
| tree | ca0f839784bf0447a0d619b21582b4d2642e4053 /src/plugins/platforms/wayland | |
| parent | b56444d86aa449e2da15d9b9fd08001f09ac9b25 (diff) | |
| download | Qt-c7537e30ba4698b52d90b68875af16285785bf70.zip Qt-c7537e30ba4698b52d90b68875af16285785bf70.tar.gz Qt-c7537e30ba4698b52d90b68875af16285785bf70.tar.bz2 | |
Remove hasOpenGL. This changes breaks binary compatibillity
so you will need to use $QTBUILDDIR/bin/syncqt and recompile all
applications
Diffstat (limited to 'src/plugins/platforms/wayland')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandintegration.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylandintegration.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index 04f3d9a..3f3ee5e 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.cpp +++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp @@ -75,6 +75,7 @@ bool QWaylandIntegration::hasCapability(QPlatformIntegration::Capability cap) co { switch (cap) { case ThreadedPixmaps: return true; + case OpenGL: return hasOpenGL(); default: return QPlatformIntegration::hasCapability(cap); } } diff --git a/src/plugins/platforms/wayland/qwaylandintegration.h b/src/plugins/platforms/wayland/qwaylandintegration.h index 20f8c5c..fc9b8d6 100644 --- a/src/plugins/platforms/wayland/qwaylandintegration.h +++ b/src/plugins/platforms/wayland/qwaylandintegration.h @@ -63,9 +63,9 @@ public: QPlatformFontDatabase *fontDatabase() const; +private: bool hasOpenGL() const; -private: QPlatformFontDatabase *mFontDb; QWaylandDisplay *mDisplay; bool mUseOpenGL; |