diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 13:04:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 13:04:26 (GMT) |
| commit | 11d2c8f96697adc93ccd82e3db1de6ecde025eff (patch) | |
| tree | 9ed5acfa397b093fd726742ae3c478c2f21223bc /doc/src/getting-started | |
| parent | 1b4bb02fcb3da77ddfa6281365ba3210aab9daad (diff) | |
| parent | f3da2f414f9fce9aa014da79be9f50c075c60936 (diff) | |
| download | Qt-11d2c8f96697adc93ccd82e3db1de6ecde025eff.zip Qt-11d2c8f96697adc93ccd82e3db1de6ecde025eff.tar.gz Qt-11d2c8f96697adc93ccd82e3db1de6ecde025eff.tar.bz2 | |
Merge remote branch 'qt/4.6' into qt-master-from-4.6
Conflicts:
src/gui/kernel/qeventdispatcher_mac.mm
src/gui/kernel/qt_cocoa_helpers_mac.mm
src/gui/widgets/qmenu_mac.mm
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/linguist/lupdate/main.cpp
Diffstat (limited to 'doc/src/getting-started')
| -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 9cda95a..bc6404c 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 |