diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-03 05:39:57 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-03 05:39:57 (GMT) |
| commit | 68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c (patch) | |
| tree | e3ae65fb615a4b06d774415fd2d742170104d9ce /tools/qml/qmlruntime.h | |
| parent | b7702b2dcbc36f81759dea0ad74fb19e97b2358f (diff) | |
| parent | e62f266a7642e675e9d235a1f54a6b5746500d48 (diff) | |
| download | Qt-68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c.zip Qt-68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c.tar.gz Qt-68c0ff0c7f1e65fb55b08a1fb9baab8176eb726c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools/qml/qmlruntime.h')
| -rw-r--r-- | tools/qml/qmlruntime.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h index 7385b14..6fa7d81 100644 --- a/tools/qml/qmlruntime.h +++ b/tools/qml/qmlruntime.h @@ -170,8 +170,6 @@ private: int record_autotime; bool devicemode; QAction *recordAction; - QString currentSkin; - bool scaleSkin; RecordingDialog *recdlg; void senseImageMagick(); @@ -180,6 +178,7 @@ private: bool ffmpegAvailable; bool convertAvailable; + QAction *rotateAction; QActionGroup *orientation; QAction *showWarningsWindow; |