summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorThierry Bastian <thierry.bastian@nokia.com>2010-11-08 23:00:11 (GMT)
committerThierry Bastian <thierry.bastian@nokia.com>2010-11-08 23:00:11 (GMT)
commit9c0b958cac97db37433e0bec33974eb8c964531f (patch)
treec923da04691486fc1d523ab7bb18771868ead352 /src/corelib
parent2c74c74a4b9fca65624d72525066501be9b50142 (diff)
parent198d903fa18d9f1d51615974d71de8236e97c2cd (diff)
downloadQt-9c0b958cac97db37433e0bec33974eb8c964531f.zip
Qt-9c0b958cac97db37433e0bec33974eb8c964531f.tar.gz
Qt-9c0b958cac97db37433e0bec33974eb8c964531f.tar.bz2
Merge branch '4.7-upstream' into 4.7-water
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index d3f399b..5598187 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -406,11 +406,10 @@ QString qAppName()
operations can call processEvents() to keep the application
responsive.
- Some Qt classes, such as QString, can be used without a
- QCoreApplication object. However, 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. exit() 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