summaryrefslogtreecommitdiffstats
path: root/tools/qml/qmlruntime.h
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-06-02 07:19:22 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-06-02 07:20:28 (GMT)
commit74232ac426d9911417e880334292925f47f0df1e (patch)
treedc12ff691f7045a8a2ed620db128cb4144c9b995 /tools/qml/qmlruntime.h
parent04eb4d19a32c92453c6a74037e4ddf065e5e4f49 (diff)
downloadQt-74232ac426d9911417e880334292925f47f0df1e.zip
Qt-74232ac426d9911417e880334292925f47f0df1e.tar.gz
Qt-74232ac426d9911417e880334292925f47f0df1e.tar.bz2
QML viewer now supports TopUp, TopDown, RightUp and LeftUp orientations
instead of Portrait/Landscape. The new orientations are named the same as the orientations in the QtMobility sensors module. Task-number: QTBUG-11106 Reviewed-by: akennedy
Diffstat (limited to 'tools/qml/qmlruntime.h')
-rw-r--r--tools/qml/qmlruntime.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index 5086e02..27bd217 100644
--- a/tools/qml/qmlruntime.h
+++ b/tools/qml/qmlruntime.h
@@ -124,7 +124,7 @@ public slots:
void ffmpegFinished(int code);
void showProxySettings ();
void proxySettingsChanged ();
- void toggleOrientation();
+ void rotateOrientation();
void statusChanged();
void setSlowMode(bool);
void launch(const QString &);
@@ -140,9 +140,8 @@ private slots:
void recordFrame();
void chooseRecordingOptions();
void pickRecordingFile();
- void setPortrait();
- void setLandscape();
void toggleFullScreen();
+ void changeOrientation(QAction*);
void orientationChanged();
void showWarnings(bool show);
@@ -183,9 +182,7 @@ private:
bool ffmpegAvailable;
bool convertAvailable;
- QAction *portraitOrientation;
- QAction *landscapeOrientation;
-
+ QActionGroup *orientation;
QAction *showWarningsWindow;
QString m_script;