diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 00:51:39 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-16 00:51:39 (GMT) |
| commit | 17fbbdd3a081a66e1d2b26db7935111c49cea75e (patch) | |
| tree | ffa4cc9c1c84950b892455b4866f306b03192e83 /src/corelib/kernel/qcoreapplication.cpp | |
| parent | d01b4d9f9ace7e815bd5881dcb6ab79bf2fdaba4 (diff) | |
| parent | df55141aa260c8a10c06aa990b6f20d6fb4718f3 (diff) | |
| download | Qt-17fbbdd3a081a66e1d2b26db7935111c49cea75e.zip Qt-17fbbdd3a081a66e1d2b26db7935111c49cea75e.tar.gz Qt-17fbbdd3a081a66e1d2b26db7935111c49cea75e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed QImageReader::format() inconsistency.
Fixed missing stroke for flat ellipses.
Doc: Documented qputenv and qgetenv
Added missing sanity checks in qimage.cpp
Fix regression, remove artificial emboldening of monospaced fonts
Doc: Said to not access events after they are posted(postEvent).
Doc: QTreeWidgetItems remove themselves from views when deleted.
Doc: Removed a link to Qt3 support in QSlider
Diffstat (limited to 'src/corelib/kernel/qcoreapplication.cpp')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 4e6e6b9..0a5e06e 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -1073,7 +1073,7 @@ void QCoreApplication::exit(int returnCode) The event must be allocated on the heap since the post event queue will take ownership of the event and delete it once it has been - posted. It is \e {not safe} to modify or delete the event after + posted. It is \e {not safe} to access the event after it has been posted. When control returns to the main event loop, all events that are @@ -1104,7 +1104,7 @@ void QCoreApplication::postEvent(QObject *receiver, QEvent *event) The event must be allocated on the heap since the post event queue will take ownership of the event and delete it once it has been - posted. It is \e {not safe} to modify or delete the event after + posted. It is \e {not safe} to access the event after it has been posted. When control returns to the main event loop, all events that are |