diff options
author | Martin Jones <martin.jones@nokia.com> | 2010-04-01 06:48:35 (GMT) |
---|---|---|
committer | Martin Jones <martin.jones@nokia.com> | 2010-04-01 06:48:35 (GMT) |
commit | 1a0cef308282cae3e2889f32a7831ea9ea6144ce (patch) | |
tree | 3abb7a0f9c8f407bc2a589d03a9a4749ce55cd39 /src/imports | |
parent | 621a470e1c996c471a5a4492a0b71a75b1add6d4 (diff) | |
parent | 119f0e46faea927c6be1d4fe33eb0851e74470ce (diff) | |
download | Qt-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.cpp | 2 |
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. |