← Back to branch summary

~osomon/oxide/context-menu

« back to all changes in this revision

Viewing changes to qt/core/gpu/oxide_qt_gl_context_dependent.cc

  • Committer: Olivier Tilloy
  • Date: 2015-04-24 11:34:28 UTC
  • mfrom: (1031.1.24 oxide)
  • Revision ID: olivier.tilloy@canonical.com-20150424113428-r221y8t5hv083t0n
Merge the latest changes from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt/core/gpu/oxide_qt_gl_context_dependent.cc
65
65
          new GLContextDependent(handle,
66
66
                                 gfx::kGLImplementationEGLGLES2));
67
67
    }
68
 
  } else if (platform.startsWith("ubuntu")) {
 
68
  } else if (platform.startsWith("ubuntu") || platform == "eglfs") {
69
69
    void* handle = pni->nativeResourceForContext("eglcontext", context);
70
70
    if (handle) {
71
71
      return make_scoped_refptr(