diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-07 22:29:43 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-07 22:29:43 (GMT) |
| commit | ef5850afa68f148ab72d46bf64a8a1be1a70bb3b (patch) | |
| tree | be4d94ab6c8cfa6710ff4c2fb5f4dcfa4e364871 /src/3rdparty/phonon/mmf/videooutput.h | |
| parent | 29e5c9b27302e455b1ae9d324687ded3a40066d2 (diff) | |
| parent | 0a9aa40dd9865e61f2799a6396ce8dcaa68329c5 (diff) | |
| download | Qt-ef5850afa68f148ab72d46bf64a8a1be1a70bb3b.zip Qt-ef5850afa68f148ab72d46bf64a8a1be1a70bb3b.tar.gz Qt-ef5850afa68f148ab72d46bf64a8a1be1a70bb3b.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlengine.cpp
Diffstat (limited to 'src/3rdparty/phonon/mmf/videooutput.h')
| -rw-r--r-- | src/3rdparty/phonon/mmf/videooutput.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/mmf/videooutput.h b/src/3rdparty/phonon/mmf/videooutput.h index 6dfe69d..2788401 100644 --- a/src/3rdparty/phonon/mmf/videooutput.h +++ b/src/3rdparty/phonon/mmf/videooutput.h @@ -63,10 +63,16 @@ public: // Debugging output void dump() const; +public Q_SLOTS: + void beginNativePaintEvent(const QRect& /*controlRect*/); + void endNativePaintEvent(const QRect& /*controlRect*/); + Q_SIGNALS: void videoWindowChanged(); void aspectRatioChanged(); void scaleModeChanged(); + void beginVideoWindowNativePaint(); + void endVideoWindowNativePaint(); protected: // Override QWidget functions |