Fix recording correct display resolution for json result on embedded

Change-Id: I7600b23043a38e881d90de6eb980fef54e77e764
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

2 files changed, 16 insertions, 8 deletions

diff --git a/src/benchmarkrunner.cpp b/src/benchmarkrunner.cpp
index 6fbc2c8..00d3604 100644
--- a/src/benchmarkrunner.cpp
+++ b/src/benchmarkrunner.cpp
@@ -60,12 +60,13 @@ void BenchmarkRunner::createView()
     m_view->setResizeMode(QQuickView::SizeRootObjectToView);
     m_view->rootContext()->setContextProperty("benchmark", this);
 
-    m_view->resize(Options::instance.windowSize);
-
-    if (Options::instance.fullscreen)
+    if (Options::instance.fullscreen) {
         m_view->showFullScreen();
-    else
+    } else {
+        m_view->resize(Options::instance.windowSize);
         m_view->show();
+    }
+
     m_view->raise();
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index 36e3071..6c06618 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -200,11 +200,18 @@ QStringList processCommandLineArguments(const QCoreApplication &app)
     Options::instance.destroyViewEachRun = parser.isSet(destroyViewOption);
     Options::instance.timeout = parser.value(timeoutOption).toInt();
 
-    QSize size(parser.value(widthOption).toInt(),
-               parser.value(heightOption).toInt());
+    if (QGuiApplication::platformName() == QLatin1String("eglfs"))
+        Options::instance.fullscreen = true;
 
-    if (size.isValid())
-        Options::instance.windowSize = size;
+    if (Options::instance.fullscreen && qGuiApp->primaryScreen() != nullptr) {
+        Options::instance.windowSize = qGuiApp->primaryScreen()->size();
+    } else {
+        QSize size(parser.value(widthOption).toInt(),
+                   parser.value(heightOption).toInt());
+
+        if (size.isValid())
+            Options::instance.windowSize = size;
+    }
 
     ResultRecorder::startResults(Options::instance.id);
     ResultRecorder::recordWindowSize(Options::instance.windowSize);