summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativewebview.cpp
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-03-01 05:05:24 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-03-01 05:05:24 (GMT)
commite8b2404e04ff38511a96ae2dfb2aa097c6ec8166 (patch)
tree91f59051e690551cb89df3d0304bb714c711b2f0 /src/declarative/graphicsitems/qdeclarativewebview.cpp
parent8095b3074a47ff317cafdce5e8a8f955bf8c97fa (diff)
parent20def6f5fe3e02bda1c5f5873ed1923d36511312 (diff)
downloadQt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.zip
Qt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.tar.gz
Qt-e8b2404e04ff38511a96ae2dfb2aa097c6ec8166.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml
Conflicts: tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativewebview.cpp')
-rw-r--r--src/declarative/graphicsitems/qdeclarativewebview.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativewebview.cpp b/src/declarative/graphicsitems/qdeclarativewebview.cpp
index 61b5b56..a2b16ba 100644
--- a/src/declarative/graphicsitems/qdeclarativewebview.cpp
+++ b/src/declarative/graphicsitems/qdeclarativewebview.cpp
@@ -177,6 +177,8 @@ void QDeclarativeWebView::init()
{
Q_D(QDeclarativeWebView);
+ QWebSettings::enablePersistentStorage();
+
setAcceptHoverEvents(true);
setAcceptedMouseButtons(Qt::LeftButton);
setFlag(QGraphicsItem::ItemHasNoContents, false);
@@ -955,6 +957,7 @@ void QDeclarativeWebView::setPage(QWebPage *page)
connect(d->page,SIGNAL(repaintRequested(QRect)),this,SLOT(paintPage(QRect)));
connect(d->page->mainFrame(),SIGNAL(urlChanged(QUrl)),this,SLOT(pageUrlChanged()));
connect(d->page->mainFrame(), SIGNAL(titleChanged(QString)), this, SIGNAL(titleChanged(QString)));
+ connect(d->page->mainFrame(), SIGNAL(titleChanged(QString)), this, SIGNAL(iconChanged()));
connect(d->page->mainFrame(), SIGNAL(iconChanged()), this, SIGNAL(iconChanged()));
connect(d->page->mainFrame(), SIGNAL(contentsSizeChanged(QSize)), this, SLOT(noteContentsSizeChanged(QSize)));
connect(d->page->mainFrame(), SIGNAL(initialLayoutCompleted()), this, SLOT(initialLayout()));