summaryrefslogtreecommitdiffstats
path: root/demos/browser/webview.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2010-08-24 13:09:04 (GMT)
committerGunnar Sletta <gunnar.sletta@nokia.com>2010-08-24 13:09:04 (GMT)
commitf58296de0d88f1b7f58efbabbb12a9e8afe6828c (patch)
tree436b343e8a749b3fcff47c8cab0ddcecc35cddf8 /demos/browser/webview.cpp
parentacf678e57ed088f3e56a551cac6c7c3322005750 (diff)
parent7a5fa8af2d0c3329dd1962d6b053388a960f8305 (diff)
downloadQt-f58296de0d88f1b7f58efbabbb12a9e8afe6828c.zip
Qt-f58296de0d88f1b7f58efbabbb12a9e8afe6828c.tar.gz
Qt-f58296de0d88f1b7f58efbabbb12a9e8afe6828c.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'demos/browser/webview.cpp')
-rw-r--r--demos/browser/webview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp
index 2f9b3e6..2cbd2f1 100644
--- a/demos/browser/webview.cpp
+++ b/demos/browser/webview.cpp
@@ -260,7 +260,7 @@ void WebView::setProgress(int progress)
void WebView::loadFinished()
{
if (100 != m_progress) {
- qWarning() << "Recieved finished signal while progress is still:" << progress()
+ qWarning() << "Received finished signal while progress is still:" << progress()
<< "Url:" << url();
}
m_progress = 0;