diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-06 02:44:51 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-11-06 02:44:51 (GMT) |
| commit | f8f97a8efa4e8f82ae4b36afc465998faeaf8b35 (patch) | |
| tree | 33a1eaa17f69dc1ba8ee770cb9dc0bc7333ca61a /src/declarative | |
| parent | 8e94e7d95f7fbc142a1a5faf3347aa165ff2426e (diff) | |
| parent | c53098a6795a485ebbdb21bf15a1df933e63a551 (diff) | |
| download | Qt-f8f97a8efa4e8f82ae4b36afc465998faeaf8b35.zip Qt-f8f97a8efa4e8f82ae4b36afc465998faeaf8b35.tar.gz Qt-f8f97a8efa4e8f82ae4b36afc465998faeaf8b35.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/graphicsitems/qmlgraphicswebview.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicswebview.cpp b/src/declarative/graphicsitems/qmlgraphicswebview.cpp index 4ac208c..5ce0ee8 100644 --- a/src/declarative/graphicsitems/qmlgraphicswebview.cpp +++ b/src/declarative/graphicsitems/qmlgraphicswebview.cpp @@ -362,7 +362,7 @@ void QmlGraphicsWebView::pageUrlChanged() expandToWebPage(); if ((d->url.isEmpty() && page()->mainFrame()->url() != QUrl(QLatin1String("about:blank"))) - || d->url != page()->mainFrame()->url()) + || d->url != page()->mainFrame()->url() && !page()->mainFrame()->url().isEmpty()) { d->url = page()->mainFrame()->url(); if (d->url == QUrl(QLatin1String("about:blank"))) |