Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/doc/src/b2qt.qdoc

Change-Id: I9d345dcc689e751b997df797ce12b6cd8a14ffb9

1 files changed, 27 insertions, 0 deletions

diff --git a/src/utils/qdroidutils.h b/src/utils/qdroidutils.h
index 339a529..9d833bb 100644
--- a/src/utils/qdroidutils.h
+++ b/src/utils/qdroidutils.h
@@ -1,3 +1,21 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc
+** All rights reserved.
+** For any questions to Digia, please use the 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
+** the contact form at http://qt.digia.com/
+**
+****************************************************************************/
 #ifndef QDROIDUTILS_H
 #define QDROIDUTILS_H
 
@@ -8,6 +26,13 @@ class Q_DECL_EXPORT QDroidUtils : public QObject
     Q_OBJECT
     Q_ENUMS(AudioStreamType)
 public:
+    enum AudioOrientation {
+        LandscapeAudioOrientation,
+        PortraitAudioOrientation,
+        SquareAudioOrientation,
+        UndefinedAudioOrientation,
+    };
+
     enum AudioStreamType {
         DefaultAudioStream = -1,
         VoiceCallAudioStream = 0,
@@ -36,6 +61,8 @@ public Q_SLOTS:
     void rebootSystem();
     void powerOffSystem();
 
+    void setOrientationForAudioSystem(AudioOrientation orientation);
+
     void setMasterVolume(int volume);
     void setMasterMute(bool mute);
     void setStreamVolume(AudioStreamType stream, int volume);