Added --original-qml-raster option to qmlscene (uses raster engine).

1 files changed, 19 insertions, 5 deletions

diff --git a/tools/qmlscene/main.cpp b/tools/qmlscene/main.cpp
index 611f654..b49f194 100644
--- a/tools/qmlscene/main.cpp
+++ b/tools/qmlscene/main.cpp
@@ -229,10 +229,19 @@ protected:
 
 struct Options
 {
-    Options() : originalQml(false), maximized(false), fullscreen(false), scenegraphOnGraphicsview(false), clip(false) { }
+    Options()
+        : originalQml(false)
+        , originalQmlRaster(false)
+        , maximized(false)
+        , fullscreen(false)
+        , scenegraphOnGraphicsview(false)
+        , clip(false)
+    {
+    }
 
     QUrl file;
     bool originalQml;
+    bool originalQmlRaster;
     bool maximized;
     bool fullscreen;
     bool scenegraphOnGraphicsview;
@@ -359,7 +368,8 @@ static void usage()
     qWarning(" options:");
     qWarning("  --maximized................................ run maximized");
     qWarning("  --fullscreen............................... run fullscreen");
-    qWarning("  --original-qml............................. run using QGraphicsView instead of scenegraph");
+    qWarning("  --original-qml............................. run using QGraphicsView instead of scenegraph (OpenGL engine)");
+    qWarning("  --original-qml-raster...................... run using QGraphicsView instead of scenegraph (Raster engine)");
     qWarning("  --no-multisample........................... Disable multisampling (anti-aliasing)");
     qWarning("  --continuous-update........................ Continuously render the scene");
     qWarning("  --nonblocking-swap......................... Do not wait for v-sync to swap buffers");
@@ -380,6 +390,8 @@ int main(int argc, char ** argv)
             options.file = QUrl::fromLocalFile(argv[i]);
         else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--original-qml"))
             options.originalQml = true;
+        else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--original-qml-raster"))
+            options.originalQmlRaster = true;
         else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--maximized"))
             options.maximized = true;
         else if (QString::fromLatin1(argv[i]).toLower() == QLatin1String("--fullscreen"))
@@ -429,7 +441,7 @@ int main(int argc, char ** argv)
                 loadDummyDataFiles(*engine, fi.path());
             }
             item->setSource(options.file);
-        } else if (!options.originalQml) {
+        } else if (!options.originalQml && !options.originalQmlRaster) {
             QxGraphicsView *qxView = new MyQxGraphicsView();
             engine = qxView->engine();
             for (int i = 0; i < imports.size(); ++i)
@@ -452,8 +464,10 @@ int main(int argc, char ** argv)
                 loadDummyDataFiles(*engine, fi.path());
             }
             gvView->setSource(options.file);
-            QGLWidget *viewport = new QGLWidget(getFormat());
-            gvView->setViewport(viewport);
+            if (!options.originalQmlRaster) {
+                QGLWidget *viewport = new QGLWidget(getFormat());
+                gvView->setViewport(viewport);
+            }
         }
 
         QObject::connect(engine, SIGNAL(quit()), QCoreApplication::instance(), SLOT(quit()));