Merge lp:~fboucault/unity-2d/fix_use_opengl into lp:unity-2d

[Florian Boucault]

D-Conf option 'use-opengl' was not taken into account because the absence of
command line parameter -opengl was overriding it.

[Florian Boucault (fboucault)]

Various indicators show that OpenGL is used:
- performance changes
- some bugs specific to the OpenGL backend appear (e.g. headers in the dash change position upon mouse hover)
- if run with QML_SHOW_FRAMERATE=1, the results differ greatly

[Alberto Mardegan (mardy)]

I'm ashamed of not having noticed this before. :-) Anyway, great fix!

review: Approve

=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-09-20 08:40:43 +0000
+++ launcher/app/launcher.cpp	2011-11-09 11:20:29 +0000
@@ -99,7 +99,9 @@
 
     /* QML declarative view */
     LauncherView *launcherView = new LauncherView(&panel);
-    launcherView->setUseOpenGL(arguments.contains("-opengl"));
+    if (arguments.contains("-opengl")) {
+        launcherView->setUseOpenGL(true);
+    }
 
     launcherView->setResizeMode(QDeclarativeView::SizeRootObjectToView);
     launcherView->setFocus();

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2011-09-20 08:40:43 +0000
+++ places/app/places.cpp	2011-11-09 11:20:29 +0000
@@ -48,7 +48,9 @@
     qmlRegisterType<DashDeclarativeView>("Unity2d", 1, 0, "DashDeclarativeView");
     DashDeclarativeView view;
     view.setAccessibleName("Dash");
-    view.setUseOpenGL(arguments.contains("-opengl"));
+    if (arguments.contains("-opengl")) {
+        view.setUseOpenGL(true);
+    }
 
     if (!view.connectToBus()) {
         qCritical() << "Another instance of the Dash already exists. Quitting.";

=== modified file 'spread/app/spread.cpp'
--- spread/app/spread.cpp	2011-08-09 17:06:35 +0000
+++ spread/app/spread.cpp	2011-11-09 11:20:29 +0000
@@ -39,7 +39,9 @@
     QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());
 
     SpreadView view;
-    view.setUseOpenGL(arguments.contains("-opengl"));
+    if (arguments.contains("-opengl")) {
+        view.setUseOpenGL(true);
+    }
 
     /* The spread window is borderless and not moveable by the user, yet not
        fullscreen */