summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-11-20 12:18:23 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-20 12:18:23 +0100
commitc83c08d84fe00a4033d7ba61fd95c150f643736d (patch)
tree088927e1b2e9d67300253c29ba73be6be6d8ae31 /src/corelib/kernel
parent1e446fc99167a992b1a8342168b6254f43b097fe (diff)
parent72ea7900858a31c1c6b93e6fed9f2f4dc30291e4 (diff)
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 1ae4da12e8..43c64b7b2c 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -1027,7 +1027,7 @@ bool QCoreApplication::closingDown()
You can call this function occasionally when your program is busy
performing a long operation (e.g. copying a file).
- In event you are running a local loop which calls this function
+ In the event that you are running a local loop which calls this function
continuously, without an event loop, the
\l{QEvent::DeferredDelete}{DeferredDelete} events will
not be processed. This can affect the behaviour of widgets,