Title: [109912] trunk/Source/WebKit2
- Revision
- 109912
- Author
- [email protected]
- Date
- 2012-03-06 05:37:58 -0800 (Tue, 06 Mar 2012)
Log Message
[Qt] Make QQuickWebView's url property work with a flickable webview
Reviewed by Tor Arne Vestbø.
QQuickWebViewPrivate::onComponentComplete implements the deferred url loading
when the url property is set in the component instantiation. QQuickWebViewFlickablePrivate
is the private sub-class used for a flickable webview, which re-implemented onComponentComplete
but forgot to call the base implementation.
* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewFlickablePrivate::onComponentComplete):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (109911 => 109912)
--- trunk/Source/WebKit2/ChangeLog 2012-03-06 13:37:44 UTC (rev 109911)
+++ trunk/Source/WebKit2/ChangeLog 2012-03-06 13:37:58 UTC (rev 109912)
@@ -1,3 +1,17 @@
+2012-03-06 Simon Hausmann <[email protected]>
+
+ [Qt] Make QQuickWebView's url property work with a flickable webview
+
+ Reviewed by Tor Arne Vestbø.
+
+ QQuickWebViewPrivate::onComponentComplete implements the deferred url loading
+ when the url property is set in the component instantiation. QQuickWebViewFlickablePrivate
+ is the private sub-class used for a flickable webview, which re-implemented onComponentComplete
+ but forgot to call the base implementation.
+
+ * UIProcess/API/qt/qquickwebview.cpp:
+ (QQuickWebViewFlickablePrivate::onComponentComplete):
+
2012-03-06 Carlos Garcia Campos <[email protected]>
[GTK] Fix several documentation issues in WebKit2 GTK+ API
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp (109911 => 109912)
--- trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-03-06 13:37:44 UTC (rev 109911)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp 2012-03-06 13:37:58 UTC (rev 109912)
@@ -574,6 +574,8 @@
// Trigger setting of correct visibility flags after everything was allocated and initialized.
_q_onVisibleChanged();
+
+ QQuickWebViewPrivate::onComponentComplete();
}
void QQuickWebViewFlickablePrivate::loadDidSucceed()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
