diff options
| author | Yoann Lopes <yoann.lopes@digia.com> | 2012-09-28 17:53:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-01 09:31:28 +0200 |
| commit | 439d5b0e53f564dc75e427743ccce75c6a62f1c6 (patch) | |
| tree | 8d2409191d2f6c8ce67e5a05928a8ccd355c6137 /examples | |
| parent | 06827f5d6e38ad01fecd99d0ce2cd74c6c63c535 (diff) | |
| download | qtmultimedia-439d5b0e53f564dc75e427743ccce75c6a62f1c6.tar.gz | |
QVideoWidget: fixed setFullScreen(false) on the Xcb platform.
Fixed exiting fullscreen when a QVideoWidget is embedded in another QWidget.
Requires change I3616dc0f in qtbase to work.
Because of a bug in some X window managers, the order in which
setWindowFlags() and showNormal() are called has been changed.
Change-Id: I335d47a3a1d9ce517978cad35597d72312150db1
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/player/videowidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/player/videowidget.cpp b/examples/player/videowidget.cpp index 0b2d70903..1dfbf94c0 100644 --- a/examples/player/videowidget.cpp +++ b/examples/player/videowidget.cpp @@ -57,7 +57,7 @@ VideoWidget::VideoWidget(QWidget *parent) void VideoWidget::keyPressEvent(QKeyEvent *event) { if (event->key() == Qt::Key_Escape && isFullScreen()) { - showNormal(); + setFullScreen(false); event->accept(); } else if (event->key() == Qt::Key_Enter && event->modifiers() & Qt::Key_Alt) { |