diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-10-06 14:11:00 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-10-06 14:11:00 (GMT) |
| commit | b49dcab1048a5497c85205702bdcab6b243ced0b (patch) | |
| tree | cc15c40203e0ec3a78d42386852f48abad45fefe /doc | |
| parent | d0cefe5e80259f089cba73e98610a6bbf93f706a (diff) | |
| parent | 8f82eb0dd996fe312192199b11abbba2b01943f0 (diff) | |
| download | Qt-b49dcab1048a5497c85205702bdcab6b243ced0b.zip Qt-b49dcab1048a5497c85205702bdcab6b243ced0b.tar.gz Qt-b49dcab1048a5497c85205702bdcab6b243ced0b.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/getting-started/gettingstartedqml.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/getting-started/gettingstartedqml.qdoc b/doc/src/getting-started/gettingstartedqml.qdoc index 0ebb448..065628a 100644 --- a/doc/src/getting-started/gettingstartedqml.qdoc +++ b/doc/src/getting-started/gettingstartedqml.qdoc @@ -655,7 +655,7 @@ directory. \code - In cppPlugins.pro: + In filedialog.pro: TEMPLATE = lib CONFIG += qt plugin @@ -881,7 +881,7 @@ text files is in the application directory, get the file's name and content as a string, and be notified whenever there are changes in the directory contents. - To build the plugin, run \c qmake on the \c cppPlugins.pro project file, then run + To build the plugin, run \c qmake on the \c filedialog.pro project file, then run \c make to build and transfer the plugin to the \c plugins directory. |