Title: [91248] trunk/Source/WebKit2
- Revision
- 91248
- Author
- [email protected]
- Date
- 2011-07-19 04:06:42 -0700 (Tue, 19 Jul 2011)
Log Message
[Qt][WK2] Make QDesktopWebView::navigationAction method usable in QML.
https://bugs.webkit.org/show_bug.cgi?id=64690
Make the API usable with QML by declaring what's needed
with the macros.
Reviewed by Benjamin Poulain.
* UIProcess/API/qt/qdesktopwebview.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (91247 => 91248)
--- trunk/Source/WebKit2/ChangeLog 2011-07-19 10:24:16 UTC (rev 91247)
+++ trunk/Source/WebKit2/ChangeLog 2011-07-19 11:06:42 UTC (rev 91248)
@@ -1,3 +1,15 @@
+2011-07-18 Alexis Menard <[email protected]>
+
+ [Qt][WK2] Make QDesktopWebView::navigationAction method usable in QML.
+ https://bugs.webkit.org/show_bug.cgi?id=64690
+
+ Make the API usable with QML by declaring what's needed
+ with the macros.
+
+ Reviewed by Benjamin Poulain.
+
+ * UIProcess/API/qt/qdesktopwebview.h:
+
2011-07-18 MORITA Hajime <[email protected]>
[ShadowContentElement] forwarded node should be able to access its hosting content element.
Modified: trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h (91247 => 91248)
--- trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h 2011-07-19 10:24:16 UTC (rev 91247)
+++ trunk/Source/WebKit2/UIProcess/API/qt/qdesktopwebview.h 2011-07-19 11:06:42 UTC (rev 91248)
@@ -40,6 +40,8 @@
Q_PROPERTY(QString title READ title NOTIFY titleChanged)
Q_PROPERTY(QUrl url READ url NOTIFY urlChanged)
+ Q_ENUMS(NavigationAction)
+
public:
QDesktopWebView();
virtual ~QDesktopWebView();
@@ -47,7 +49,7 @@
QUrl url() const;
QString title() const;
- QAction* navigationAction(QtWebKit::NavigationAction which) const;
+ Q_INVOKABLE QAction* navigationAction(QtWebKit::NavigationAction which) const;
public Q_SLOTS:
void load(const QUrl&);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
