summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>2012-11-29 11:18:16 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-29 17:42:07 +0100
commit0b37ed02625ec09978ad763677e2cd3339ba0e9c (patch)
tree0ef031af11c9ff1bc0afaf6ad7d145039332f96b /src/widgets
parent4727bb59912484b7f67a56b1fbed4919d5b71c19 (diff)
doc: Remove references to Qt 4 in QMainWindow introduction
Also make it read less as a porting guide from Qt 3. Change-Id: I78f93c643d236e13ba4ef76eeea1a98be4573def Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc b/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc
index a42570058c..a27b2f4622 100644
--- a/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc
+++ b/src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc
@@ -159,14 +159,13 @@
\section1 The Main Window Classes
- Qt 4 provides the following classes for managing main windows and
+ Qt provides the following classes for managing main windows and
associated user interface components:
\list
- \li QMainWindow remains the central class around which applications
- can be built. The interface to this class has been simplified, and
- much of the functionality previously included in this class is now
- present in the companion QDockWidget and QToolBar classes.
+ \li QMainWindow is the central class around which applications
+ can be built. Along with the companion QDockWidget and QToolBar
+ classes, it represents the top-level user interface of the application.
\li QDockWidget provides a widget that can be used to create
detachable tool palettes or helper windows. Dock widgets keep track
@@ -176,7 +175,7 @@
\li QToolBar provides a generic toolbar widget that can hold a
number of different action-related widgets, such as buttons,
drop-down menus, comboboxes, and spin boxes. The emphasis on a
- unified action model in Qt 4 means that toolbars cooperate well
+ unified action model in Qt means that toolbars cooperate well
with menus and keyboard shortcuts.
\endlist