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

Conflicts:
	configure.exe
	src/network/access/qhttpnetworkconnection_p.h
	tests/auto/qstyle/qstyle.pro
	tests/auto/qstyle/tst_qstyle.cpp
	tools/configure/configureapp.cpp

configure.exe will be recompiled in next commit. Took ours.

4 files changed, 14 insertions, 14 deletions

diff --git a/src/gui/widgets/qabstractspinbox_p.h b/src/gui/widgets/qabstractspinbox_p.h
index 15f5d97..0d00e04 100644
--- a/src/gui/widgets/qabstractspinbox_p.h
+++ b/src/gui/widgets/qabstractspinbox_p.h
@@ -135,8 +135,6 @@ public:
     mutable QValidator::State cachedState;
     mutable QSize cachedSizeHint, cachedMinimumSizeHint;
     uint pendingEmit : 1;
-    uint spindownEnabled : 1;
-    uint spinupEnabled : 1;
     uint readOnly : 1;
     uint wrapping : 1;
     uint ignoreCursorPositionChanged : 1;
diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp
index 5d7359a..c9706cf 100644
--- a/src/gui/widgets/qmainwindow.cpp
+++ b/src/gui/widgets/qmainwindow.cpp
@@ -1433,9 +1433,10 @@ bool QMainWindow::event(QEvent *event)
     \i Toolbar breaks are not respected or preserved
     \i Any custom widgets in the toolbar will not be shown if the toolbar
         becomes too small (only actions will be shown)
-    \i If you call showFullScreen() on the main window, the QToolbar will
-        disappear since it is considered to be part of the title bar. You can
-        work around this by turning off the unified toolbar before you call
+    \i Before Qt 4.5, if you called showFullScreen() on the main window, the QToolbar would
+        disappear since it is considered to be part of the title bar. Qt 4.5 and up will now work around this by pulling
+        the toolbars out and back into the regular toolbar and vice versa when you swap out.
+        However, a good practice would be that turning off the unified toolbar before you call
         showFullScreen() and restoring it after you call showNormal().
     \endlist
 
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index 5777297..98e62b7 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -661,8 +661,9 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti
     \header \i String matches \i Placement \i Notes
     \row \i about.*
          \i Application Menu | About <application name>
-         \i If this entry is not found no About item will appear in
-            the Application Menu
+         \i The application name is fetched from the \c {Info.plist} file
+            (see note below). If this entry is not found no About item
+            will appear in the Application Menu. 
     \row \i config, options, setup, settings or preferences
          \i Application Menu | Preferences
          \i If this entry is not found the Settings item will be disabled
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp
index cc367bb..90fd209 100644
--- a/src/gui/widgets/qplaintextedit.cpp
+++ b/src/gui/widgets/qplaintextedit.cpp
@@ -1005,14 +1005,13 @@ void QPlainTextEditPrivate::ensureViewportLayouted()
     QPlainText uses very much the same technology and concepts as
     QTextEdit, but is optimized for plain text handling.
 
-    QPlainTextEdit works on paragraphs and characters. A paragraph is a
-    formatted string which is word-wrapped to fit into the width of
+    QPlainTextEdit works on paragraphs and characters. A paragraph is
+    a formatted string which is word-wrapped to fit into the width of
     the widget. By default when reading plain text, one newline
     signifies a paragraph. A document consists of zero or more
-    paragraphs. The words in the paragraph are aligned in accordance
-    with the paragraph's alignment. Paragraphs are separated by hard
-    line breaks. Each character within a paragraph has its own
-    attributes, for example, font and color.
+    paragraphs. Paragraphs are separated by hard line breaks. Each
+    character within a paragraph has its own attributes, for example,
+    font and color.
 
     The shape of the mouse cursor on a QPlainTextEdit is
     Qt::IBeamCursor by default.  It can be changed through the
@@ -1154,7 +1153,8 @@ void QPlainTextEditPrivate::ensureViewportLayouted()
 
 
     \sa QTextDocument, QTextCursor, {Application Example},
-	{Syntax Highlighter Example}, {Rich Text Processing}
+        {Code Editor Example}, {Syntax Highlighter Example},
+        {Rich Text Processing}
 
 */