Merge lp:~mterry/oxide/mirserver-1.5 into lp:oxide/1.5

[Michael Terry]

Recognize "mirserver" as a valid ubuntu platform type, and use the GLES2 implementation in that case.

Recognize "mirserver" as a valid ubuntu platform type, and use the GLES2 implementation in that case.

Same fix as https://code.launchpad.net/~mterry/oxide/mirserver/+merge/255128 but for 1.5

[Olivier Tilloy (osomon)]

Not needed any longer, oxide 1.9 is now available on all supported releases of ubuntu.

review: Disapprove

Unmerged revisions

974. By Michael Terry on 2015-04-10

Support mirserver as a QPA platform, to fix a crash in the wizard

=== modified file 'qt/core/browser/oxide_qt_browser_startup.cc'
--- qt/core/browser/oxide_qt_browser_startup.cc	2015-03-09 17:17:33 +0000
+++ qt/core/browser/oxide_qt_browser_startup.cc	2015-04-10 12:47:44 +0000
@@ -155,7 +155,7 @@
     if (platform == QLatin1String("xcb")) {
       supported_gl_impls |= oxide::SUPPORTED_GL_IMPL_DESKTOP_GL;
       supported_gl_impls |= oxide::SUPPORTED_GL_IMPL_EGL_GLES2;
-    } else if (platform.startsWith("ubuntu")) {
+    } else if (platform.startsWith("ubuntu") || platform == QLatin1String("mirserver")) {
       supported_gl_impls |= oxide::SUPPORTED_GL_IMPL_EGL_GLES2;
     } else {
       LOG(WARNING) << "Unrecognized Qt platform: " << qPrintable(platform);

=== modified file 'qt/core/common/oxide_qt_screen_utils.cc'
--- qt/core/common/oxide_qt_screen_utils.cc	2015-01-24 15:38:34 +0000
+++ qt/core/common/oxide_qt_screen_utils.cc	2015-04-10 12:47:44 +0000
@@ -84,7 +84,7 @@
   }
 
   QString platform = QGuiApplication::platformName();
-  if (platform.startsWith("ubuntu")) {
+  if (platform.startsWith("ubuntu") || platform == "mirserver") {
     QByteArray grid_unit_px(qgetenv("GRID_UNIT_PX"));
     bool ok;
     float scale = grid_unit_px.toFloat(&ok);