diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-29 10:12:46 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-29 10:12:46 (GMT) |
| commit | 26af4d54ea4f3a48d053038f34a00aa1119a585b (patch) | |
| tree | 67054f761fe6f00e5295f02e4a6710dd97fa3d93 /doc/src | |
| parent | 7f72741f06a6e9acdbcd99da6b438b3e7a1a753a (diff) | |
| parent | 9c2ee0daafd159058d0804d4fc65a8ef1a4ed852 (diff) | |
| download | Qt-26af4d54ea4f3a48d053038f34a00aa1119a585b.zip Qt-26af4d54ea4f3a48d053038f34a00aa1119a585b.tar.gz Qt-26af4d54ea4f3a48d053038f34a00aa1119a585b.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed `make test' for xmlpatternsxqts.
Doc: Put the correct images with the D-Bus and Embedded Linux sections.
Call cheaper clear() instead of assigning new QString()
Fix some foreach usage to use const refs
googlesuggest example: Add newline to end of file
Core classes, examples, demos: Some changes from string to char
Fix header labels on mac with rtl
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/getting-started/examples.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc index 6b4ec61..0c18773 100644 --- a/doc/src/getting-started/examples.qdoc +++ b/doc/src/getting-started/examples.qdoc @@ -406,7 +406,7 @@ \clearfloat \section1 \l{D-Bus Examples}{D-Bus} \beginfloatleft - \l{D-Bus Examples}{\inlineimage qt-embedded-examples.png + \l{D-Bus Examples}{\inlineimage dbus-examples.png } \endfloat @@ -416,7 +416,7 @@ \clearfloat \section1 \l{Qt for Embedded Linux Examples}{Qt for Embedded Linux} \beginfloatleft - \l{Qt for Embedded Linux Examples}{\inlineimage dbus-examples.png + \l{Qt for Embedded Linux Examples}{\inlineimage qt-embedded-examples.png } \endfloat |