Title: [136228] trunk/Source/WebCore
- Revision
- 136228
- Author
- hausm...@webkit.org
- Date
- 2012-11-30 04:59:33 -0800 (Fri, 30 Nov 2012)
Log Message
Unreviewed, rolling out r136227.
http://trac.webkit.org/changeset/136227
Broke the Qt bots due to version mismatch
* platform/graphics/gstreamer/PlatformVideoWindowQt.cpp:
(FullScreenVideoWindow::FullScreenVideoWindow):
(PlatformVideoWindow::PlatformVideoWindow):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (136227 => 136228)
--- trunk/Source/WebCore/ChangeLog 2012-11-30 12:50:38 UTC (rev 136227)
+++ trunk/Source/WebCore/ChangeLog 2012-11-30 12:59:33 UTC (rev 136228)
@@ -1,3 +1,14 @@
+2012-11-30 Simon Hausmann <simon.hausm...@digia.com>
+
+ Unreviewed, rolling out r136227.
+ http://trac.webkit.org/changeset/136227
+
+ Broke the Qt bots due to version mismatch
+
+ * platform/graphics/gstreamer/PlatformVideoWindowQt.cpp:
+ (FullScreenVideoWindow::FullScreenVideoWindow):
+ (PlatformVideoWindow::PlatformVideoWindow):
+
2012-11-30 Samuel Rødal <samuel.ro...@digia.com>
[Qt] Fixed use of to-be-removed compatibility functions in QWindow.
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp (136227 => 136228)
--- trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp 2012-11-30 12:50:38 UTC (rev 136227)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp 2012-11-30 12:59:33 UTC (rev 136228)
@@ -38,7 +38,7 @@
FullScreenVideoWindow::FullScreenVideoWindow()
: m_mediaElement(0)
{
- setModality(Qt::ApplicationModal);
+ setWindowModality(Qt::ApplicationModal);
#ifndef QT_NO_CURSOR
m_cursorTimer.setSingleShot(true);
@@ -115,7 +115,7 @@
{
QWindow* win = new FullScreenVideoWindow();
m_window = win;
- win->setFlags(win->flags() | Qt::FramelessWindowHint);
+ win->setWindowFlags(win->windowFlags() | Qt::FramelessWindowHint);
// FIXME: Port to Qt 5.
win->showFullScreen();
m_videoWindowId = win->winId();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
