summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-04-01 06:48:35 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-04-01 06:48:35 (GMT)
commit1a0cef308282cae3e2889f32a7831ea9ea6144ce (patch)
tree3abb7a0f9c8f407bc2a589d03a9a4749ce55cd39 /src/imports
parent621a470e1c996c471a5a4492a0b71a75b1add6d4 (diff)
parent119f0e46faea927c6be1d4fe33eb0851e74470ce (diff)
downloadQt-1a0cef308282cae3e2889f32a7831ea9ea6144ce.zip
Qt-1a0cef308282cae3e2889f32a7831ea9ea6144ce.tar.gz
Qt-1a0cef308282cae3e2889f32a7831ea9ea6144ce.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/webkit/qdeclarativewebview.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/webkit/qdeclarativewebview.cpp b/src/imports/webkit/qdeclarativewebview.cpp
index 1ff1078..5db812c 100644
--- a/src/imports/webkit/qdeclarativewebview.cpp
+++ b/src/imports/webkit/qdeclarativewebview.cpp
@@ -123,7 +123,7 @@ public:
This type is made available by importing the \c org.webkit module:
- \b{import org.webkit 1.0}
+ \bold{import org.webkit 1.0}
If the width and height of the item is not set, they will
dynamically adjust to a size appropriate for the content.