Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt

4 files changed, 21 insertions, 8 deletions

diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc
index 97713b1..2706182 100644
--- a/doc/src/designer-manual.qdoc
+++ b/doc/src/designer-manual.qdoc
@@ -344,10 +344,14 @@
     of a QLineEdit or the width and height of item view widgets. This is where
     the widget size constraints -- \l{QWidget::minimumSize()}{minimumSize} and
     \l{QWidget::maximumSize()}{maximumSize} constraints come into play. These
-    are properties you can set in the property editor. Alternatively, to use
-    the current size as a size constraint value, choose one of the
-    \gui{Size Constraint} options from the widget's context menu. The layout
-    will then ensure that those constraints are met.
+    are properties you can set in the property editor. For example, to override
+    the default \l{QWidget::}{sizeHint()}, simply set
+    \l{QWidget::minimumSize()}{minimumSize} and \l{QWidget::maximumSize()}
+    {maximumSize} to the same value. Alternatively, to use the current size as
+    a size constraint value, choose one of the \gui{Size Constraint} options
+    from the widget's context menu. The layout  will then ensure that those
+    constraints are met. To control the size of your widgets via code, you can
+    reimplement \l{QWidget::}{sizeHint()} in your code.
 
     The screenshot below shows the breakdown of a basic user interface designed
     using a grid. The coordinates on the screenshot show the position of each
diff --git a/doc/src/examples/flowlayout.qdoc b/doc/src/examples/flowlayout.qdoc
index 5fdafe2..3e7ec22 100644
--- a/doc/src/examples/flowlayout.qdoc
+++ b/doc/src/examples/flowlayout.qdoc
@@ -53,7 +53,7 @@
 
 	The Flowlayout class mainly uses QLayout and QWidgetItem, while the
 	Window uses QWidget and QLabel. We will only document the definition 
-	and implementation of \cFlowLayout below.
+	and implementation of \c FlowLayout below.
 
     \section1 FlowLayout Class Definition
     
@@ -156,4 +156,4 @@
 	the parent is a QLayout, will be determined by querying the spacing 
 	of the parent layout.
 
-*/
\ No newline at end of file
+*/
diff --git a/doc/src/exportedfunctions.qdoc b/doc/src/exportedfunctions.qdoc
index f67950c..f051ddc 100644
--- a/doc/src/exportedfunctions.qdoc
+++ b/doc/src/exportedfunctions.qdoc
@@ -129,6 +129,9 @@
     on Mac OS X or be part of the main window. This feature is on by
     default.
 
+    In Qt 4.6, this is equivalent to
+    \c { QApplication::instance()->setAttribute(Qt::AA_DontUseNativeMenuBar); }.
+
     \section1 void qt_mac_set_press_and_hold_context(bool \e{enable})
 
     Turns emulation of the right mouse button by clicking and holding
diff --git a/doc/src/qnamespace.qdoc b/doc/src/qnamespace.qdoc
index 9ea6b52..ad59b8d 100644
--- a/doc/src/qnamespace.qdoc
+++ b/doc/src/qnamespace.qdoc
@@ -146,10 +146,16 @@
            widgets stay non-native unless specifically set by the
            Qt::WA_NativeWindow attribute.
 
-    \value AA_MacPluginApplication Stops the a Qt mac application from doing
+    \value AA_MacPluginApplication Stops the Qt mac application from doing
            specific initializations that do not necessarily make sense when using Qt
            to author a plugin. This includes avoiding loading our nib for the main
-           menu and not taking possession of the native menu bar.
+           menu and not taking possession of the native menu bar. When setting this
+           attribute to true will also set the AA_DontUseNativeMenuBar attribute
+           to true.
+
+    \value AA_DontUseNativeMenuBar All menubars created while this attribute is
+           set to true won't be used as a native menubar (e.g, the menubar at
+           the top of the main screen on Mac OS X or at the bottom in Windows CE).
 
     \omitvalue AA_AttributeCount
 */