Merge branch 'release' into stable

* release:
  Fix typo Main -> SharedMain
  Fix stand alone demo layout issues on portrait devices
  Exclude mediaplayer also from eLinux-bone, since not working

Change-Id: I25ec98b4c3380155230a5381b4146e71da124de5

1 files changed, 7 insertions, 1 deletions

diff --git a/basicsuite/shared/main.cpp b/basicsuite/shared/main.cpp
index 74781e9..808d5df 100644
--- a/basicsuite/shared/main.cpp
+++ b/basicsuite/shared/main.cpp
@@ -75,7 +75,13 @@ int main(int argc, char **argv)
     view.rootContext()->setContextProperty("engine", &engine);
     view.setColor(Qt::black);
     view.setResizeMode(QQuickView::SizeRootObjectToView);
-    view.setSource(QUrl::fromLocalFile(path + QStringLiteral("/loader.qml")));
+
+    QSize screenSize = QGuiApplication::primaryScreen()->size();
+    QString mainFile = screenSize.width() < screenSize.height()
+        ? QStringLiteral("/main_landscape.qml")
+        : QStringLiteral("/SharedMain.qml");
+
+    view.setSource(QUrl::fromLocalFile(path + mainFile));
     view.show();
 
     app.exec();