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, 30 insertions, 0 deletions

diff --git a/basicsuite/shared/main_landscape.qml b/basicsuite/shared/main_landscape.qml
new file mode 100644
index 0000000..46b7fc5
--- /dev/null
+++ b/basicsuite/shared/main_landscape.qml
@@ -0,0 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use contact form at http://qt.digia.com
+**
+** This file is part of Qt Enterprise Embedded.
+**
+** Licensees holding valid Qt Enterprise licenses may use this file in
+** accordance with the Qt Enterprise License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.
+**
+** If you have questions regarding the use of this file, please use
+** contact form at http://qt.digia.com
+**
+****************************************************************************/
+import QtQuick 2.0
+
+Item {
+    width: 800
+    height: 1280
+
+    SharedMain {
+        anchors.centerIn: parent
+        width: parent.height
+        height: parent.width
+        rotation: 90
+    }
+}