From 0b37ed02625ec09978ad763677e2cd3339ba0e9c Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Thu, 29 Nov 2012 11:18:16 +0100 Subject: 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 --- src/widgets/doc/src/windows-and-dialogs/mainwindow.qdoc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'src/widgets/doc/src/windows-and-dialogs') 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 -- cgit v1.2.3