Title: [136707] trunk
- Revision
- 136707
- Author
- [email protected]
- Date
- 2012-12-05 09:48:15 -0800 (Wed, 05 Dec 2012)
Log Message
Fix compilation for Qt5.0.0 stable branch.
https://bugs.webkit.org/show_bug.cgi?id=103870
Source/WebCore:
Patch by Andras Becsi <[email protected]> on 2012-12-05
Reviewed by Simon Hausmann.
This is a squashed patch consisting of patches by multiple authors.
Fixed use of to-be-removed compatibility functions in QWindow
Patch by Samuel Rødal <[email protected]>
Build fix. No new tests needed.
* platform/graphics/gstreamer/PlatformVideoWindowQt.cpp:
(FullScreenVideoWindow::FullScreenVideoWindow):
(PlatformVideoWindow::PlatformVideoWindow):
Source/WebKit2:
Patch by Michael Brüning <[email protected]> on 2012-12-05
Reviewed by Simon Hausmann.
QWindow::pos() and QQuickItem::pos() have been renamed to position().
Patch by Lars Knoll <[email protected]>
* UIProcess/qt/PageViewportControllerClientQt.cpp:
(WebKit::PageViewportControllerClientQt::setContentRectVisiblePositionAtScale):
(WebKit::PageViewportControllerClientQt::setViewportPosition):
Tools:
Patch by Andras Becsi <[email protected]> on 2012-12-05
Reviewed by Simon Hausmann.
Fix the use of renamed QWindow functions.
Patch by Andras Becsi <[email protected]>
* MiniBrowser/qt/BrowserWindow.cpp:
(BrowserWindow::BrowserWindow):
(BrowserWindow::onTitleChanged):
* MiniBrowser/qt/raw/View.cpp:
(View::View):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (136706 => 136707)
--- trunk/Source/WebCore/ChangeLog 2012-12-05 17:45:56 UTC (rev 136706)
+++ trunk/Source/WebCore/ChangeLog 2012-12-05 17:48:15 UTC (rev 136707)
@@ -1,3 +1,21 @@
+2012-12-05 Andras Becsi <[email protected]>
+
+ Fix compilation for Qt5.0.0 stable branch.
+ https://bugs.webkit.org/show_bug.cgi?id=103870
+
+ Reviewed by Simon Hausmann.
+
+ This is a squashed patch consisting of patches by multiple authors.
+
+ Fixed use of to-be-removed compatibility functions in QWindow
+ Patch by Samuel Rødal <[email protected]>
+
+ Build fix. No new tests needed.
+
+ * platform/graphics/gstreamer/PlatformVideoWindowQt.cpp:
+ (FullScreenVideoWindow::FullScreenVideoWindow):
+ (PlatformVideoWindow::PlatformVideoWindow):
+
2012-12-05 John J. Barton <[email protected]>
Web Inspector: more robust treeoutline.findTreeElement
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp (136706 => 136707)
--- trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp 2012-12-05 17:45:56 UTC (rev 136706)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/PlatformVideoWindowQt.cpp 2012-12-05 17:48:15 UTC (rev 136707)
@@ -38,7 +38,7 @@
FullScreenVideoWindow::FullScreenVideoWindow()
: m_mediaElement(0)
{
- setWindowModality(Qt::ApplicationModal);
+ setModality(Qt::ApplicationModal);
#ifndef QT_NO_CURSOR
m_cursorTimer.setSingleShot(true);
@@ -115,7 +115,7 @@
{
QWindow* win = new FullScreenVideoWindow();
m_window = win;
- win->setWindowFlags(win->windowFlags() | Qt::FramelessWindowHint);
+ win->setFlags(win->flags() | Qt::FramelessWindowHint);
// FIXME: Port to Qt 5.
win->showFullScreen();
m_videoWindowId = win->winId();
Modified: trunk/Source/WebKit2/ChangeLog (136706 => 136707)
--- trunk/Source/WebKit2/ChangeLog 2012-12-05 17:45:56 UTC (rev 136706)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-05 17:48:15 UTC (rev 136707)
@@ -1,3 +1,17 @@
+2012-12-05 Michael Brüning <[email protected]>
+
+ Fix compilation for Qt5.0.0 stable branch.
+ https://bugs.webkit.org/show_bug.cgi?id=103870
+
+ Reviewed by Simon Hausmann.
+
+ QWindow::pos() and QQuickItem::pos() have been renamed to position().
+ Patch by Lars Knoll <[email protected]>
+
+ * UIProcess/qt/PageViewportControllerClientQt.cpp:
+ (WebKit::PageViewportControllerClientQt::setContentRectVisiblePositionAtScale):
+ (WebKit::PageViewportControllerClientQt::setViewportPosition):
+
2012-12-05 Christophe Dumez <[email protected]>
[EFL][WK2] EWK2UnitTestBase.ewk_favicon_database_async_icon_get is crashing with new Ewk_Context
Modified: trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp (136706 => 136707)
--- trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2012-12-05 17:45:56 UTC (rev 136706)
+++ trunk/Source/WebKit2/UIProcess/qt/PageViewportControllerClientQt.cpp 2012-12-05 17:48:15 UTC (rev 136707)
@@ -88,7 +88,7 @@
// To animate the position together with the scale we multiply the position with the current scale
// and add it to the page position (displacement on the flickable contentItem because of additional items).
- QPointF newPosition(m_pageItem->pos() + location * itemScale);
+ QPointF newPosition(m_pageItem->position() + location * itemScale);
m_viewportItem->setContentPos(newPosition);
}
@@ -317,7 +317,7 @@
void PageViewportControllerClientQt::setViewportPosition(const FloatPoint& contentsPoint)
{
- QPointF newPosition((m_pageItem->pos() + QPointF(contentsPoint)) * m_pageItem->contentsScale());
+ QPointF newPosition((m_pageItem->position() + QPointF(contentsPoint)) * m_pageItem->contentsScale());
m_viewportItem->setContentPos(newPosition);
updateViewportController();
}
Modified: trunk/Tools/ChangeLog (136706 => 136707)
--- trunk/Tools/ChangeLog 2012-12-05 17:45:56 UTC (rev 136706)
+++ trunk/Tools/ChangeLog 2012-12-05 17:48:15 UTC (rev 136707)
@@ -1,3 +1,19 @@
+2012-12-05 Andras Becsi <[email protected]>
+
+ Fix compilation for Qt5.0.0 stable branch.
+ https://bugs.webkit.org/show_bug.cgi?id=103870
+
+ Reviewed by Simon Hausmann.
+
+ Fix the use of renamed QWindow functions.
+ Patch by Andras Becsi <[email protected]>
+
+ * MiniBrowser/qt/BrowserWindow.cpp:
+ (BrowserWindow::BrowserWindow):
+ (BrowserWindow::onTitleChanged):
+ * MiniBrowser/qt/raw/View.cpp:
+ (View::View):
+
2012-12-05 Jussi Kukkonen <[email protected]>
[WK2] InjectedBundle should check Intent url for null
Modified: trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp (136706 => 136707)
--- trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2012-12-05 17:45:56 UTC (rev 136706)
+++ trunk/Tools/MiniBrowser/qt/BrowserWindow.cpp 2012-12-05 17:48:15 UTC (rev 136707)
@@ -39,8 +39,8 @@
BrowserWindow::BrowserWindow(WindowOptions* options)
: m_windowOptions(options)
{
- setWindowTitle("MiniBrowser");
- setWindowFlags(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
+ setTitle("MiniBrowser");
+ setFlags(Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint);
setResizeMode(QQuickView::SizeRootObjectToView);
// This allows starting MiniBrowser from the build directory without previously defining QML_IMPORT_PATH.
@@ -147,7 +147,7 @@
{
if (title.isEmpty())
title = QLatin1String("MiniBrowser");
- setWindowTitle(title);
+ setTitle(title);
}
void BrowserWindow::zoomIn()
Modified: trunk/Tools/MiniBrowser/qt/raw/View.cpp (136706 => 136707)
--- trunk/Tools/MiniBrowser/qt/raw/View.cpp 2012-12-05 17:45:56 UTC (rev 136706)
+++ trunk/Tools/MiniBrowser/qt/raw/View.cpp 2012-12-05 17:48:15 UTC (rev 136707)
@@ -62,7 +62,7 @@
{
setSurfaceType(OpenGLSurface);
setGeometry(50, 50, 980, 600);
- setWindowFlags(Qt::Window | Qt::WindowTitleHint);
+ setFlags(Qt::Window | Qt::WindowTitleHint);
create();
m_context = new QOpenGLContext;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
