summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorMorten Sørvig <msorvig@trolltech.com>2009-07-30 12:25:41 (GMT)
committerMorten Sørvig <msorvig@trolltech.com>2009-07-30 12:25:41 (GMT)
commit2fb1b5378e551a42554b42c028226e65b3b41593 (patch)
tree48359652b4b09cdc37a91297489fd7e6985c27a9 /src/gui/kernel
parent26e9f4e077c49d1191835def595e4fb70ee50be2 (diff)
parent66a3c503e8e99b8cd28c2fef2b0a869f27c7efe7 (diff)
downloadQt-2fb1b5378e551a42554b42c028226e65b3b41593.zip
Qt-2fb1b5378e551a42554b42c028226e65b3b41593.tar.gz
Qt-2fb1b5378e551a42554b42c028226e65b3b41593.tar.bz2
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qapplication.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 5181689..109ceb1 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -179,11 +179,11 @@ QApplicationPrivate::~QApplicationPrivate()
QApplication contains the main event loop, where all events from the window
system and other sources are processed and dispatched. It also handles the
- application's initialization and finalization, and provides session
- management. In addition, it handles most system-wide and application-wide
- settings.
+ application's initialization, finalization, and provides session
+ management. In addition, QApplication handles most of the system-wide and
+ application-wide settings.
- For any GUI application using Qt, there is precisely one QApplication
+ For any GUI application using Qt, there is precisely \bold one QApplication
object, no matter whether the application has 0, 1, 2 or more windows at
any given time. For non-GUI Qt applications, use QCoreApplication instead,
as it does not depend on the \l QtGui library.
@@ -239,9 +239,9 @@ QApplicationPrivate::~QApplicationPrivate()
saveState() for details.
\endlist
- The QApplication object does so much initialization. Hence, it \e{must} be
+ Since the QApplication object does so much initialization, it \e{must} be
created before any other objects related to the user interface are created.
- Since QApplication also deals with common command line arguments, it is
+ QApplication also deals with common command line arguments. Hence, it is
usually a good idea to create it \e before any interpretation or
modification of \c argv is done in the application itself.