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 | |
| 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
| -rw-r--r-- | doc/src/getting-started/gettingstartedqml.qdoc | 4 | ||||
| -rw-r--r-- | examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro (renamed from examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro) | 0 | ||||
| -rw-r--r-- | examples/tutorials/gettingStarted/gsQml/texteditor.pro | 4 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 8 |
4 files changed, 11 insertions, 5 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. diff --git a/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro b/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro index d85787d..d85787d 100644 --- a/examples/tutorials/gettingStarted/gsQml/filedialog/cppPlugins.pro +++ b/examples/tutorials/gettingStarted/gsQml/filedialog/filedialog.pro diff --git a/examples/tutorials/gettingStarted/gsQml/texteditor.pro b/examples/tutorials/gettingStarted/gsQml/texteditor.pro new file mode 100644 index 0000000..aa5306c --- /dev/null +++ b/examples/tutorials/gettingStarted/gsQml/texteditor.pro @@ -0,0 +1,4 @@ +TEMPLATE = subdirs +SUBDIRS = \ + filedialog\ + diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index ad0ffd7..32e85db 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -511,9 +511,11 @@ delivery at a later time. \value AutoConnection - (default) Same as DirectConnection, if the emitter and - receiver are in the same thread. Same as QueuedConnection, - if the emitter and receiver are in different threads. + (default) If the object sending the signal is in a different thread + than the receiving object, the signal is queued, behaving as + Qt::QueuedConnection. If both objects are in the same thread, + the slot is invoked directly, behaving as Qt::DirectConnection. The + type of connection is determined when the signal is emitted. \value DirectConnection The slot is invoked immediately, when the signal is |