diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-03 10:53:57 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2010-08-03 10:53:57 (GMT) |
| commit | d5491ecdde14659a913c9f476f18c45f1d9489bb (patch) | |
| tree | 06cc52249feda9bd9e50ca47abb8ebd676c8a309 /tools/qml/qmlruntime.h | |
| parent | 42cdfaf86d34afeb6448723839fef70fe477deed (diff) | |
| parent | a41128af5373a0225c3548abd3eb82cd7e8f7a0e (diff) | |
| download | Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.zip Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.tar.gz Qt-d5491ecdde14659a913c9f476f18c45f1d9489bb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into lighthouse
Conflicts:
configure
Diffstat (limited to 'tools/qml/qmlruntime.h')
| -rw-r--r-- | tools/qml/qmlruntime.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h index 68d3452..6fa7d81 100644 --- a/tools/qml/qmlruntime.h +++ b/tools/qml/qmlruntime.h @@ -105,6 +105,7 @@ public: QDeclarativeView *view() const; LoggerWidget *warningsWidget() const; + QString currentFile() const { return currentFileOrUrl; } void enableExperimentalGestures(); @@ -169,8 +170,6 @@ private: int record_autotime; bool devicemode; QAction *recordAction; - QString currentSkin; - bool scaleSkin; RecordingDialog *recdlg; void senseImageMagick(); @@ -179,6 +178,7 @@ private: bool ffmpegAvailable; bool convertAvailable; + QAction *rotateAction; QActionGroup *orientation; QAction *showWarningsWindow; |