diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2010-03-08 05:26:30 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2010-03-09 05:47:00 (GMT) |
| commit | 4367951cbb4a0ddb739724878dc9a1cabad5a773 (patch) | |
| tree | 75ec265505c522eda16ee97ccc2db5440bd3b8e5 /src/imports | |
| parent | 173994419413e89e6b1c7ab3cf58dff82f1e5789 (diff) | |
| download | Qt-4367951cbb4a0ddb739724878dc9a1cabad5a773.zip Qt-4367951cbb4a0ddb739724878dc9a1cabad5a773.tar.gz Qt-4367951cbb4a0ddb739724878dc9a1cabad5a773.tar.bz2 | |
Make QDeclarativeItem NOTIFY signals canonical
Task-number: QTBUG-7193
Reviewed-by: akennedy
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/webkit/qdeclarativewebview.cpp | 8 | ||||
| -rw-r--r-- | src/imports/webkit/qdeclarativewebview_p.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/imports/webkit/qdeclarativewebview.cpp b/src/imports/webkit/qdeclarativewebview.cpp index d78ba28..f8b2b88 100644 --- a/src/imports/webkit/qdeclarativewebview.cpp +++ b/src/imports/webkit/qdeclarativewebview.cpp @@ -80,6 +80,7 @@ public: rendering(true) { } + void focusChanged(bool); QUrl url; // page url might be different if it has not loaded yet QWebPage *page; @@ -378,11 +379,12 @@ QVariant QDeclarativeWebView::evaluateJavaScript(const QString &scriptSource) return this->page()->mainFrame()->evaluateJavaScript(scriptSource); } -void QDeclarativeWebView::focusChanged(bool hasFocus) +void QDeclarativeWebViewPrivate::focusChanged(bool hasFocus) { + Q_Q(QDeclarativeWebView); QFocusEvent e(hasFocus ? QEvent::FocusIn : QEvent::FocusOut); - page()->event(&e); - QDeclarativeItem::focusChanged(hasFocus); + q->page()->event(&e); + QDeclarativeItemPrivate::focusChanged(hasFocus); } void QDeclarativeWebView::initialLayout() diff --git a/src/imports/webkit/qdeclarativewebview_p.h b/src/imports/webkit/qdeclarativewebview_p.h index 145e74b..95f51d1 100644 --- a/src/imports/webkit/qdeclarativewebview_p.h +++ b/src/imports/webkit/qdeclarativewebview_p.h @@ -239,7 +239,6 @@ protected: void keyReleaseEvent(QKeyEvent* event); virtual void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry); - virtual void focusChanged(bool); virtual bool sceneEvent(QEvent *event); QDeclarativeWebView *createWindow(QWebPage::WebWindowType type); |