summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2011-01-31 14:57:45 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2011-01-31 14:57:45 (GMT)
commit1e7ab0e849900bacf71935f2a2150116b8dc17d1 (patch)
treed635ca87c7ff1690cd8574f17d5d584eab42c08c /src/corelib/kernel
parente5974b024828578945bd4c349f5f87f82a635225 (diff)
parent9b9c664470af22ab79ed6211cc5c02d715493657 (diff)
downloadQt-1e7ab0e849900bacf71935f2a2150116b8dc17d1.zip
Qt-1e7ab0e849900bacf71935f2a2150116b8dc17d1.tar.gz
Qt-1e7ab0e849900bacf71935f2a2150116b8dc17d1.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-review into 4.7
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 381be34..7d88b10 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -462,10 +462,10 @@ QString qAppName()
operations can call processEvents() to keep the application
responsive.
- In general, we recommend that you create a QCoreApplication or
- a QApplication object in your \c main() function as early as
- possible. exit() will not return until the event loop exits;
- e.g., when quit() is called.
+ In general, we recommend that you create a QCoreApplication or a
+ QApplication object in your \c main() function as early as
+ possible. exec() will not return until the event loop exits; e.g.,
+ when quit() is called.
Several static convenience functions are also provided. The
QCoreApplication object is available from instance(). Events can