From 15de11bfcd2907e587dff41013fd39b62f0ca869 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Fri, 8 May 2009 16:26:49 +1000
Subject: Make sure qmlviewer uses raster graphcis system, or respects what was
 input.

---
 tools/qmlviewer/main.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/tools/qmlviewer/main.cpp b/tools/qmlviewer/main.cpp
index 379fda9..9a008d2 100644
--- a/tools/qmlviewer/main.cpp
+++ b/tools/qmlviewer/main.cpp
@@ -47,18 +47,24 @@ int main(int argc, char ** argv)
     //### default to using raster graphics backend for now
     int newargc = argc + 2;
     char **newargv;
-    newargv = new char * [newargc];
+    bool gsSpecified = false;
     for (int i = 0; i < argc; ++i) {
-        newargv[i] = argv[i];
         if (!qstrcmp(argv[i], "-graphicssystem")) {
+            gsSpecified = true;
             newargc -= 2;
             break;
         }
     }
-    char system[] = "-graphicssystem";
-    newargv[argc] = system;
-    char raster[] = "raster";
-    newargv[argc+1] = raster;
+    newargv = new char * [newargc];
+    for (int i = 0; i < argc; ++i) {
+        newargv[i] = argv[i];
+    }
+    if (!gsSpecified) {
+        char system[] = "-graphicssystem";
+        newargv[argc] = system;
+        char raster[] = "raster";
+        newargv[argc+1] = raster;
+    }
 
     QApplication app(newargc, newargv);
     app.setApplicationName("viewer");
-- 
cgit v0.12