diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:01:25 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-03-08 12:02:41 +0100 |
| commit | 79f2480c868523a7d8ffc9fb15055e8eab3237ba (patch) | |
| tree | 8336143e8c09810dc97324970fed61af27e26a97 /doc/src/examples/textfinder.qdoc | |
| parent | 7e4f32993498db0e06346e32458a1ec7d0c7b3ec (diff) | |
| parent | 12f221410fbe41d0b2efda4cd3289dfcf9044aa8 (diff) | |
Merge remote-tracking branch 'origin/api_changes' into containters
Conflicts:
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qvariant.cpp
src/tools/moc/moc.h
Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6
Diffstat (limited to 'doc/src/examples/textfinder.qdoc')
| -rw-r--r-- | doc/src/examples/textfinder.qdoc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/examples/textfinder.qdoc b/doc/src/examples/textfinder.qdoc index 17c52c2208..8f1ed5d340 100644 --- a/doc/src/examples/textfinder.qdoc +++ b/doc/src/examples/textfinder.qdoc @@ -37,16 +37,16 @@ resource and is loaded into the display at startup. \table - \row \o \inlineimage textfinder-example-find.png - \o \inlineimage textfinder-example-find2.png + \row \li \inlineimage textfinder-example-find.png + \li \inlineimage textfinder-example-find2.png \endtable \section1 Setting Up The Resource File The resources required for Text Finder are: \list - \o \e{textfinder.ui} - the user interface file created in QtDesigner - \o \e{input.txt} - a text file containing some text to be displayed + \li \e{textfinder.ui} - the user interface file created in QtDesigner + \li \e{input.txt} - a text file containing some text to be displayed in the QTextEdit \endlist |