From ba18a0dd03be4c063d27deab4cd864a189ea705a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 8 Nov 2011 00:08:40 -0600 Subject: Fix accidental conversion of dockwin --- doc/html/qmainwindow.html | 48 +++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) (limited to 'doc/html/qmainwindow.html') diff --git a/doc/html/qmainwindow.html b/doc/html/qmainwindow.html index c7b5a2d..cb00d2b 100644 --- a/doc/html/qmainwindow.html +++ b/doc/html/qmainwindow.html @@ -273,7 +273,7 @@ moving dock windows you can specify their 'edge' (dock area). The currently available edges are: Top, Left, Right, Bottom, Minimized (effectively a 'hidden' dock area) and TornOff (floating). See Qt::Dock for an explanation of these areas. Note that the *ToolBar functions are included for backward compatibility; all new code should use the *DockWindow functions. -QToolbar is a subclass of QDockWindow so all functions that work +QToolbar is a subclass of QDockWindow so all functions that work with dock windows work on toolbars in the same way.

If the user clicks the close button, then the dock window is @@ -293,8 +293,8 @@ dock the floating dock window. (See also QMainWindow::DockWindows.)

Some functions change the appearance of a QMainWindow globally: