Merge branch 4.7 into qt-master-from-4.7

27 files changed, 578 insertions, 370 deletions

diff --git a/bin/syncqt b/bin/syncqt
index faa3575..99562fb 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -694,10 +694,7 @@ my @ignore_for_qt_begin_header_check = ( "qiconset.h", "qconfig.h", "qconfig-dis
 my @ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h", "qatomic_arm.h", "qatomic_armv7.h" );
 my @ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtSql}/drivers", "$modules{QtTest}", "$modules{QtDesigner}", "$modules{QtUiTools}", "$modules{QtDBus}", "$modules{phonon}" );
 my %colliding_headers = ();
-my %inject_headers;
-# Force generation of forwarding header for qconfig.h if (and only if) we can't
-# find the header by normal means.
-%inject_headers = ( "$basedir/src/corelib/global" => ( "*qconfig.h" ) ) unless (-e "$basedir/src/corelib/global/qconfig.h");
+my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir
 
 foreach my $lib (@modules_to_sync) {
     #iteration info
@@ -799,7 +796,12 @@ foreach my $lib (@modules_to_sync) {
         #calc files and "copy" them
         foreach my $subdir (@subdirs) {
             my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);
-            push @headers, $inject_headers{$subdir} if (defined $inject_headers{$subdir});
+            if (defined $inject_headers{$subdir}) {
+                foreach my $if ($inject_headers{$subdir}) {
+                    @headers = grep(!/^\Q$if\E$/, @headers); #in case we configure'd previously
+                    push @headers, "*".$if;
+                }
+            }
             foreach my $header (@headers) {
                 my $shadow = ($header =~ s/^\*//);
                 $header = 0 if($header =~ /^ui_.*.h/);
@@ -877,7 +879,7 @@ foreach my $lib (@modules_to_sync) {
                             @headers = ( "$out_basedir/include/$lib/private/$header" );
                         }
                         foreach(@headers) { #sync them
-                            $header_copies++ if(syncHeader($_, $iheader, $copy_headers, $ts));
+                            $header_copies++ if(syncHeader($_, $iheader, $copy_headers && !$shadow, $ts));
                         }
 
                         if($public_header) {
diff --git a/configure b/configure
index da48dba..5cdbaf2 100755
--- a/configure
+++ b/configure
@@ -2553,14 +2553,8 @@ if [ "$OPT_SHADOW" = "yes" ]; then
     ShadowMkspecs()
     {
         rm -rf "$outpath/mkspecs/$1"
-        if [ "$UNAME_SYSTEM" = "Linux" ]; then
-            # This works with GNU coreutils, and is needed for ScratchBox
-            cp -rs "$relpath/mkspecs/$1" "$outpath/mkspecs/$1"
-        else
-            # A simple "cp -rs" doesn't work on Mac. :(
-            find "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p
-            find "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | xargs -n 1 -I % ln -s "$relpath/%" "$outpath/%"
-        fi
+        find "$relpath/mkspecs/$1" -type d | sed "s,^$relpath,$outpath," | xargs mkdir -p
+        find "$relpath/mkspecs/$1" -type f | sed "s,^$relpath/,," | while read f; do ln -s "$relpath/$f" "$outpath/$f"; done
     }
 
     # Special case for mkspecs/features directory.
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index e42dfca..57fc18a 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -45,7 +45,7 @@
                   <li><a href="how-to-learn-qt.html">How to learn Qt</a></li>
                   <li><a href="tutorials.html">Tutorials</a></li>
                   <li><a href="all-examples.html">Examples</a></li>
-                  <li><a href="qt4-7-intro.html">Whats new in Qt 4.7</a></li>
+                  <li><a href="qt4-7-intro.html">What's new in Qt 4.7</a></li>
                 </ul>
               </div>
             </div>
diff --git a/doc/src/legal/trademarks.qdoc b/doc/src/legal/trademarks.qdoc
index 42cb7a9..3bf783f 100644
--- a/doc/src/legal/trademarks.qdoc
+++ b/doc/src/legal/trademarks.qdoc
@@ -33,20 +33,20 @@
     \brief Information about trademarks owned by Nokia and other organisations.
 
     Nokia, the Nokia logo, Qt, and the Qt logo are trademarks of Nokia
-    Corporation and/or its subsidiaries in Finland and other countries.
+    Corporation and/or its subsidiaries in Finland and other countries.
 
     \list
     \o Intel, Intel Inside (logos), MMX and Pentium are \reg trademarks of
        Intel Corporation in the United States, other countries, or both.
-    \o Java and all Java-based trademarks are trademarks of Sun Microsystems,
-       Inc. in the United States, other countries, or both.
+    \o Oracle and Java are registered trademarks of Oracle and/or its affiliates.
+       Other names may be trademarks of their respective owners.
     \o Linux is a \reg trademark of Linus Torvalds in the United States, other
        countries or both. 
     \o Mac, Mac OS and Macintosh are \reg trademarks of Apple Computer, Inc.,
        registered in the U.S. and other countries. 
-    \o Microsoft, Windows, Windows NT, XP, Visual Studio and the Windows logo
-       are \reg trademarks of Microsoft Corporation in the United States, other
-       countries, or both. 
+    \o Microsoft, Windows, Windows NT, XP, Windows Vista, Visual Studio and the
+       Windows logo are \reg trademarks of Microsoft Corporation in the United
+       States, other countries, or both.
     \o Motif is a registered trademark of The Open Group in the United States,
        other countries, or both. 
     \o OpenGL is a \reg trademark of Silicon Graphics, Inc. in the United States
diff --git a/doc/src/template/scripts/functions.js b/doc/src/template/scripts/functions.js
index 47539d2..62bc535 100755
--- a/doc/src/template/scripts/functions.js
+++ b/doc/src/template/scripts/functions.js
@@ -105,17 +105,17 @@ function processNokiaData(response){
 			/* start a new list element */
 			full_li_element = '<li';
 					/* if the pageType element reads APIPage, add class name api */
-      if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage') {
+      if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'APIPage') {
       	full_li_element += ' class="api"';
       	apiCount++;
       }
 					/* if the pageType element reads Article, add class name article */
-      else if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article') {
+      else if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Article') {
       	full_li_element += ' class="article"';
       	articleCount++;
       }
 					/* if the pageType element reads Example, add class name example */
-      else if (propertyTags[j].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example') {
+      else if (propertyTags[i].getElementsByTagName('pageType')[0].firstChild.nodeValue == 'Example') {
       	full_li_element += ' class="example"';
       	exampleCount++;
       }
diff --git a/doc/src/template/style/narrow.css b/doc/src/template/style/narrow.css
index c1e3f61..fbb0752 100644
--- a/doc/src/template/style/narrow.css
+++ b/doc/src/template/style/narrow.css
@@ -223,6 +223,7 @@
       float: right;
       margin: 15px 40px 0 0;
       font-size: 11px;
+      position: relative;
     }
 
     .narrow #narrowmenu {
diff --git a/doc/src/template/style/style.css b/doc/src/template/style/style.css
index 536b3c8..16bc9ed 100755
--- a/doc/src/template/style/style.css
+++ b/doc/src/template/style/style.css
@@ -101,7 +101,7 @@
     }
     a
     {
-        color: #00732f;
+        color: #00732F;
         text-decoration: none;
     }
     hr
@@ -660,13 +660,31 @@
 		-webkit-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
 		-moz-box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
 		box-shadow: 0 4px 6px 0 rgba(0,0,0,.2);
+		font-size: 11px;
+	}
+
+	#resultdialog a
+  {
+      color: #00732f;
 	}
 
 	#resultdialog.active {
 	  display: block;
-	  width:30%;
 	}
 
+	.narrow #resultdialog {
+	  width: 60%;
+	  _width: 360px;
+	}
+
+	.narrow #resultdialog.active {
+    right: 10px;
+	  *left: auto;
+	  _left: auto;
+    _right: -20px;
+	}
+
+
 	#resultdialog #resultclose {
 	  float: right;
 	}
@@ -779,6 +797,7 @@
         margin-right: 15px;
         font-weight: bold;
         color: #B0ADAB;
+        font: bold 10px/1.2 Verdana;
     }
 
     .toolbuttons #print
@@ -892,7 +911,6 @@
     }
     .wrap .content h2
     {
-	border-bottom:1px solid #DDDDDD;
 	font:600 16px/1.2 Arial;
 	margin-top:15px;
 	width:100%;	
@@ -990,7 +1008,7 @@
 	/*display:inline-block;*/
 	margin-left:10px;
 	min-width:250px;
-	line-height: 1.2;
+	line-height: 1.5;
 	min-width:100%;
 	min-height:15px;
 	}
@@ -1279,6 +1297,10 @@
         background-color: #E6E7E8;
         margin: 0;
     }
+   .small
+    {
+        font: normal 9px/1 Verdana;
+    }	
 /* end footer elements */
 
 
@@ -1453,7 +1475,7 @@
 	}
 
 
-    .creator .header, .footer, .wrapper
+    .creator .header, .creator .footer, .creator .wrapper
     {
         max-width: 1500px;
         margin: 0px;
@@ -1658,6 +1680,58 @@
 	}
 /* end of creator spec*/
 	
+	.item {
+	  float: left;
+	  position: relative;
+	  width: 100%;
+	  overflow: hidden;
+	}
+
+
+	.item .primary {
+	  margin-right: 220px;
+	  position: relative;
+	}
+
+	.item hr {
+	  margin-left: -220px;
+	}
+
+	.item .secondary {
+	  float: right;
+	  width: 200px;
+	  position: relative;
+	}
+
+	.item .cols {
+	  clear: both;
+	  display: block;
+	}
+
+	.item .cols .col {
+	  float: left;
+	  margin-left: 1.5%;
+	}
+
+	.item .cols .col.first {
+	  margin-left: 0;
+	}
+
+	.item .cols.two .col {
+	  width: 45%;
+	}
+
+	.item .box {
+	  margin: 0 0 10px 0;
+	}
+
+	.item .box h3 {
+	  margin: 0 0 10px 0;
+	}
+
+	.cols.unclear {
+		clear:none;
+	}
 }
 
 /* end of screen media */
diff --git a/examples/network/bearermonitor/bearermonitor.cpp b/examples/network/bearermonitor/bearermonitor.cpp
index 2c976ff..75ffb01 100644
--- a/examples/network/bearermonitor/bearermonitor.cpp
+++ b/examples/network/bearermonitor/bearermonitor.cpp
@@ -41,8 +41,8 @@
 #include "bearermonitor.h"
 #include "sessionwidget.h"
 
-#include <QDebug>
-#include <QMessageBox>
+#include <QtCore/QDebug>
+
 #ifdef Q_OS_WIN
 #include <winsock2.h>
 #undef interface
@@ -56,20 +56,18 @@ BearerMonitor::BearerMonitor(QWidget *parent)
 :   QWidget(parent)
 {
     setupUi(this);
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#ifdef MAEMO_UI
     newSessionButton->hide();
     deleteSessionButton->hide();
 #else
     delete tabWidget->currentWidget();
     sessionGroup->hide();
 #endif
-#if defined (Q_OS_SYMBIAN) || defined(Q_OS_WINCE) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WINCE) || defined(MAEMO_UI)
     setWindowState(Qt::WindowMaximized);
 #endif
     updateConfigurations();
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
     onlineStateChanged(!manager.allConfigurations(QNetworkConfiguration::Active).isEmpty());
-#endif
     QNetworkConfiguration defaultConfiguration = manager.defaultConfiguration();
     for (int i = 0; i < treeWidget->topLevelItemCount(); ++i) {
         QTreeWidgetItem *item = treeWidget->topLevelItem(i);
@@ -104,7 +102,7 @@ BearerMonitor::BearerMonitor(QWidget *parent)
 
     connect(newSessionButton, SIGNAL(clicked()),
             this, SLOT(createNewSession()));
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
+#ifndef MAEMO_UI
     connect(deleteSessionButton, SIGNAL(clicked()),
             this, SLOT(deleteSession()));
 #endif
@@ -257,15 +255,9 @@ void BearerMonitor::updateConfigurations()
 void BearerMonitor::onlineStateChanged(bool isOnline)
 {
     if (isOnline)
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
-        QMessageBox::information(this, "Connection state changed", "Online", QMessageBox::Close);
-    else
-        QMessageBox::information(this, "Connection state changed", "Offline", QMessageBox::Close);
-#else
         onlineState->setText(tr("Online"));
     else
         onlineState->setText(tr("Offline"));
-#endif
 }
 
 #ifdef Q_OS_WIN
@@ -393,7 +385,7 @@ void BearerMonitor::createSessionFor(QTreeWidgetItem *item)
 
     tabWidget->addTab(session, conf.name());
 
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
+#ifndef MAEMO_UI
     sessionGroup->show();
 #endif
 
@@ -408,7 +400,7 @@ void BearerMonitor::createNewSession()
     createSessionFor(item);
 }
 
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
+#ifndef MAEMO_UI
 void BearerMonitor::deleteSession()
 {
     SessionWidget *session = qobject_cast<SessionWidget *>(tabWidget->currentWidget());
diff --git a/examples/network/bearermonitor/bearermonitor.h b/examples/network/bearermonitor/bearermonitor.h
index 45e7275..df1c78b 100644
--- a/examples/network/bearermonitor/bearermonitor.h
+++ b/examples/network/bearermonitor/bearermonitor.h
@@ -45,7 +45,7 @@
 #include <qnetworksession.h>
 #if defined (Q_OS_SYMBIAN) || defined(Q_OS_WINCE)	
 #include "ui_bearermonitor_240_320.h"
-#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#elif defined(MAEMO_UI)
 #include "ui_bearermonitor_maemo.h"
 #else
 #include "ui_bearermonitor_640_480.h"
@@ -81,7 +81,7 @@ private slots:
 
     void createSessionFor(QTreeWidgetItem *item);
     void createNewSession();
-#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6)
+#ifndef MAEMO_UI
     void deleteSession();
 #endif
     void performScan();
diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro
index 4b2c35b..bd9bd68 100644
--- a/examples/network/bearermonitor/bearermonitor.pro
+++ b/examples/network/bearermonitor/bearermonitor.pro
@@ -8,7 +8,8 @@ SOURCES = main.cpp \
           bearermonitor.cpp \
           sessionwidget.cpp
 
-maemo5|maemo6 {
+maemo5|maemo6|linux-g++-maemo {
+  DEFINES += MAEMO_UI
   FORMS = bearermonitor_maemo.ui \
           sessionwidget_maemo.ui
 } else {
diff --git a/examples/network/bearermonitor/bearermonitor_maemo.ui b/examples/network/bearermonitor/bearermonitor_maemo.ui
index a7940c6..9c72bfd 100644
--- a/examples/network/bearermonitor/bearermonitor_maemo.ui
+++ b/examples/network/bearermonitor/bearermonitor_maemo.ui
@@ -7,300 +7,359 @@
     <x>0</x>
     <y>0</y>
     <width>612</width>
-    <height>495</height>
+    <height>555</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>BearerMonitor</string>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0">
    <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
+    <widget class="QGroupBox" name="systemState">
+     <property name="title">
+      <string>System State</string>
      </property>
-     <property name="currentIndex">
-      <number>0</number>
+     <property name="flat">
+      <bool>true</bool>
      </property>
-     <property name="usesScrollButtons">
-      <bool>false</bool>
+     <layout class="QHBoxLayout" name="horizontalLayout_3">
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="onlineStateLabel">
+        <property name="text">
+         <string>Online State:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QLabel" name="onlineState">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
+    <widget class="QGroupBox" name="configurations">
+     <property name="title">
+      <string>Configurations &amp;&amp; Sessions</string>
      </property>
-     <widget class="QWidget" name="tab">
-      <attribute name="title">
-       <string>Configurations</string>
-      </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
-       <item>
-        <widget class="QTreeWidget" name="treeWidget">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <attribute name="headerVisible">
-          <bool>false</bool>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_5">
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QTabWidget" name="tabWidget">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="currentIndex">
+         <number>0</number>
+        </property>
+        <property name="usesScrollButtons">
+         <bool>false</bool>
+        </property>
+        <widget class="QWidget" name="tab">
+         <attribute name="title">
+          <string>Configurations</string>
          </attribute>
-         <column>
-          <property name="text">
-           <string>1</string>
-          </property>
-         </column>
-        </widget>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
-         <item>
-          <layout class="QHBoxLayout" name="configurationNameLayout">
-           <item>
-            <widget class="QLabel" name="configurationNameLabel">
-             <property name="text">
-              <string>Name:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationName">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationStateLayout">
-           <item>
-            <widget class="QLabel" name="configurationStateLabel">
-             <property name="text">
-              <string>State:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationState">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationTypeLayout">
-           <item>
-            <widget class="QLabel" name="configurationTypeLabel">
-             <property name="text">
-              <string>Type:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationType">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string>Invalid</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationPurposeLayout">
-           <item>
-            <widget class="QLabel" name="configurationPurposeLabel">
-             <property name="text">
-              <string>Purpose:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationPurpose">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string>Unknown</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationIdentifierLayout">
-           <item>
-            <widget class="QLabel" name="configurationIdentifierLabel">
-             <property name="text">
-              <string>Identifier:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationIdentifier">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationRoamingLayout">
-           <item>
-            <widget class="QLabel" name="configurationRoamingLabel">
-             <property name="text">
-              <string>Roaming:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationRoaming">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="text">
-              <string/>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <layout class="QHBoxLayout" name="configurationChildrenLayout">
-           <item>
-            <widget class="QLabel" name="configurationChildrenLabel">
-             <property name="text">
-              <string>Children:</string>
-             </property>
-            </widget>
-           </item>
-           <item>
-            <widget class="QLabel" name="configurationChildren">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
+         <layout class="QHBoxLayout" name="horizontalLayout_2">
+          <item>
+           <widget class="QTreeWidget" name="treeWidget">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="rootIsDecorated">
+             <bool>false</bool>
+            </property>
+            <attribute name="headerVisible">
+             <bool>false</bool>
+            </attribute>
+            <column>
              <property name="text">
-              <string/>
+              <string>1</string>
              </property>
-            </widget>
-           </item>
-          </layout>
-         </item>
-         <item>
-          <widget class="QGroupBox" name="nlaGroup">
-           <property name="title">
-            <string>Network Location Awareness</string>
-           </property>
-           <layout class="QHBoxLayout" name="horizontalLayout">
+            </column>
+           </widget>
+          </item>
+          <item>
+           <layout class="QVBoxLayout" name="verticalLayout_2">
+            <item>
+             <layout class="QHBoxLayout" name="configurationNameLayout">
+              <item>
+               <widget class="QLabel" name="configurationNameLabel">
+                <property name="text">
+                 <string>Name:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationName">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationStateLayout">
+              <item>
+               <widget class="QLabel" name="configurationStateLabel">
+                <property name="text">
+                 <string>State:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationState">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationTypeLayout">
+              <item>
+               <widget class="QLabel" name="configurationTypeLabel">
+                <property name="text">
+                 <string>Type:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationType">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Invalid</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationPurposeLayout">
+              <item>
+               <widget class="QLabel" name="configurationPurposeLabel">
+                <property name="text">
+                 <string>Purpose:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationPurpose">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string>Unknown</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationIdentifierLayout">
+              <item>
+               <widget class="QLabel" name="configurationIdentifierLabel">
+                <property name="text">
+                 <string>Identifier:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationIdentifier">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationRoamingLayout">
+              <item>
+               <widget class="QLabel" name="configurationRoamingLabel">
+                <property name="text">
+                 <string>Roaming:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationRoaming">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <layout class="QHBoxLayout" name="configurationChildrenLayout">
+              <item>
+               <widget class="QLabel" name="configurationChildrenLabel">
+                <property name="text">
+                 <string>Children:</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QLabel" name="configurationChildren">
+                <property name="sizePolicy">
+                 <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+                  <horstretch>0</horstretch>
+                  <verstretch>0</verstretch>
+                 </sizepolicy>
+                </property>
+                <property name="text">
+                 <string/>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item>
+             <widget class="QGroupBox" name="nlaGroup">
+              <property name="title">
+               <string>Network Location Awareness</string>
+              </property>
+              <layout class="QHBoxLayout" name="horizontalLayout">
+               <item>
+                <widget class="QPushButton" name="registerButton">
+                 <property name="text">
+                  <string>Register</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QPushButton" name="unregisterButton">
+                 <property name="text">
+                  <string>Unregister</string>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </widget>
+            </item>
             <item>
-             <widget class="QPushButton" name="registerButton">
+             <widget class="QPushButton" name="newSessionButton">
               <property name="text">
-               <string>Register</string>
+               <string>New Session</string>
               </property>
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="unregisterButton">
+             <widget class="QPushButton" name="deleteSessionButton">
               <property name="text">
-               <string>Unregister</string>
+               <string>Delete Session</string>
               </property>
              </widget>
             </item>
+            <item>
+             <widget class="QPushButton" name="scanButton">
+              <property name="text">
+               <string>Scan</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QProgressBar" name="progressBar">
+              <property name="maximum">
+               <number>0</number>
+              </property>
+              <property name="value">
+               <number>23280</number>
+              </property>
+              <property name="textVisible">
+               <bool>false</bool>
+              </property>
+              <property name="invertedAppearance">
+               <bool>false</bool>
+              </property>
+              <property name="format">
+               <string>%p%</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="verticalSpacer">
+              <property name="orientation">
+               <enum>Qt::Vertical</enum>
+              </property>
+              <property name="sizeHint" stdset="0">
+               <size>
+                <width>20</width>
+                <height>40</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
            </layout>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="newSessionButton">
-           <property name="text">
-            <string>New Session</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="deleteSessionButton">
-           <property name="text">
-            <string>Delete Session</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QPushButton" name="scanButton">
-           <property name="text">
-            <string>Scan</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QProgressBar" name="progressBar">
-           <property name="maximum">
-            <number>0</number>
-           </property>
-           <property name="value">
-            <number>23280</number>
-           </property>
-           <property name="textVisible">
-            <bool>false</bool>
-           </property>
-           <property name="invertedAppearance">
-            <bool>false</bool>
-           </property>
-           <property name="format">
-            <string>%p%</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="verticalSpacer">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-      </layout>
-     </widget>
+          </item>
+         </layout>
+        </widget>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>
diff --git a/examples/network/bearermonitor/main.cpp b/examples/network/bearermonitor/main.cpp
index 1a22c13..11399e4 100644
--- a/examples/network/bearermonitor/main.cpp
+++ b/examples/network/bearermonitor/main.cpp
@@ -38,7 +38,8 @@
 **
 ****************************************************************************/
 
-#include <QApplication>
+#include <QtGui/QApplication>
+#include <QtGui/QMainWindow>
 
 #include "bearermonitor.h"
 
@@ -46,8 +47,12 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
 
+    QMainWindow mainWindow;
+
     BearerMonitor monitor;
-    monitor.show();
+
+    mainWindow.setCentralWidget(&monitor);
+    mainWindow.show();
 
     return app.exec();
 }
diff --git a/examples/network/bearermonitor/sessionwidget.cpp b/examples/network/bearermonitor/sessionwidget.cpp
index 5ec9d53..51de0f2 100644
--- a/examples/network/bearermonitor/sessionwidget.cpp
+++ b/examples/network/bearermonitor/sessionwidget.cpp
@@ -74,7 +74,7 @@ SessionWidget::SessionWidget(const QNetworkConfiguration &config, QWidget *paren
             this, SLOT(closeSession()));
     connect(stopSessionButton, SIGNAL(clicked()),
             this, SLOT(stopSession()));
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#ifdef MAEMO_UI
     connect(deleteSessionButton, SIGNAL(clicked()),
             this, SLOT(deleteSession()));
 #endif
@@ -94,7 +94,7 @@ void SessionWidget::timerEvent(QTimerEvent *e)
     }
 }
 
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#ifdef MAEMO_UI
 void SessionWidget::deleteSession()
 {
     delete this;
diff --git a/examples/network/bearermonitor/sessionwidget.h b/examples/network/bearermonitor/sessionwidget.h
index c92db44..846a1af 100644
--- a/examples/network/bearermonitor/sessionwidget.h
+++ b/examples/network/bearermonitor/sessionwidget.h
@@ -42,7 +42,8 @@
 #define SESSIONWIDGET_H
 
 #include <qnetworksession.h>
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+
+#ifdef MAEMO_UI
 #include "ui_sessionwidget_maemo.h"
 #else
 #include "ui_sessionwidget.h"
@@ -71,7 +72,7 @@ private Q_SLOTS:
     void stopSession();
     void updateSession();
     void updateSessionError(QNetworkSession::SessionError error);
-#if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
+#ifdef MAEMO_UI
     void deleteSession();
 #endif
 
diff --git a/mkspecs/win32-msvc2003/qmake.conf b/mkspecs/win32-msvc2003/qmake.conf
index 63d1ffd..a573a4d 100644
--- a/mkspecs/win32-msvc2003/qmake.conf
+++ b/mkspecs/win32-msvc2003/qmake.conf
@@ -53,7 +53,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
-QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS
diff --git a/mkspecs/win32-msvc2005/qmake.conf b/mkspecs/win32-msvc2005/qmake.conf
index 265d028..aa58e30 100644
--- a/mkspecs/win32-msvc2005/qmake.conf
+++ b/mkspecs/win32-msvc2005/qmake.conf
@@ -55,7 +55,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
-QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
diff --git a/mkspecs/win32-msvc2008/qmake.conf b/mkspecs/win32-msvc2008/qmake.conf
index 1432645..ee7b99a 100644
--- a/mkspecs/win32-msvc2008/qmake.conf
+++ b/mkspecs/win32-msvc2008/qmake.conf
@@ -57,7 +57,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
-QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
diff --git a/mkspecs/win32-msvc2010/qmake.conf b/mkspecs/win32-msvc2010/qmake.conf
index 84086e2..44e460e 100644
--- a/mkspecs/win32-msvc2010/qmake.conf
+++ b/mkspecs/win32-msvc2010/qmake.conf
@@ -57,7 +57,7 @@ QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH) -Fo$@ @<<
 QMAKE_LINK              = link
 QMAKE_LFLAGS            = /NOLOGO
 QMAKE_LFLAGS_RELEASE    = /INCREMENTAL:NO
-QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /INCREMENTAL:NO /DEBUG
+QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO = /DEBUG /OPT:REF
 QMAKE_LFLAGS_DEBUG      = /DEBUG
 QMAKE_LFLAGS_CONSOLE    = /SUBSYSTEM:CONSOLE
 QMAKE_LFLAGS_WINDOWS    = /SUBSYSTEM:WINDOWS \"/MANIFESTDEPENDENCY:type=\'win32\' name=\'Microsoft.Windows.Common-Controls\' version=\'6.0.0.0\' publicKeyToken=\'6595b64144ccf1df\' language=\'*\' processorArchitecture=\'*\'\"
diff --git a/src/declarative/util/qdeclarativestateoperations.cpp b/src/declarative/util/qdeclarativestateoperations.cpp
index 8cb813c..d1d7822 100644
--- a/src/declarative/util/qdeclarativestateoperations.cpp
+++ b/src/declarative/util/qdeclarativestateoperations.cpp
@@ -648,7 +648,7 @@ void QDeclarativeStateChangeScript::setScript(const QDeclarativeScriptString &s)
 }
 
 /*!
-    \qmlproperty script StateChangeScript::script
+    \qmlproperty string StateChangeScript::name
     This property holds the name of the script. This name can be used by a
     ScriptAction to target a specific script.
 
diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index b8aafe3..5002beb 100644
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -80,11 +80,43 @@ QT_BEGIN_NAMESPACE
     directories. In the simplest case, it can be used with a suitable display
     widget as part of a browser or filter.
 
-    QFileSystemModel will not fetch any files or directories until setRootPath
+    QFileSystemModel can be accessed using the standard interface provided by
+    QAbstractItemModel, but it also provides some convenience functions that are
+    specific to a directory model.
+    The fileInfo(), isDir(), name(), and path() functions provide information
+    about the underlying files and directories related to items in the model.
+    Directories can be created and removed using mkdir(), rmdir().
+
+    \note QFileSystemModel requires an instance of a GUI application.
+
+    \section1 Example Usage
+
+    A directory model that displays the contents of a default directory
+    is usually constructed with a parent object:
+
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 2
+
+    A tree view can be used to display the contents of the model
+
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 4
+
+    and the contents of a particular directory can be displayed by
+    setting the tree view's root index:
+
+    \snippet doc/src/snippets/shareddirmodel/main.cpp 7
+
+    The view's root index can be used to control how much of a
+    hierarchical model is displayed. QDirModel provides a convenience
+    function that returns a suitable model index for a path to a
+    directory within the model.
+
+    \section1 Caching and Performance
+
+    QFileSystemModel will not fetch any files or directories until setRootPath()
     is called.  This will prevent any unnecessary querying on the file system
     until that point such as listing the drives on Windows.
 
-    Unlike the QDirModel, QFileSystemModel uses a separate thread to populate
+    Unlike QDirModel, QFileSystemModel uses a separate thread to populate
     itself so it will not cause the main thread to hang as the file system
     is being queried.  Calls to rowCount() will return 0 until the model
     populates a directory.
@@ -92,15 +124,6 @@ QT_BEGIN_NAMESPACE
     QFileSystemModel keeps a cache with file information. The cache is
     automatically kept up to date using the QFileSystemWatcher.
 
-    QFileSystemModel can be accessed using the standard interface provided by
-    QAbstractItemModel, but it also provides some convenience functions that are
-    specific to a directory model.
-    The fileInfo(), isDir(), name(), and path() functions provide information
-    about the underlying files and directories related to items in the model.
-    Directories can be created and removed using mkdir(), rmdir().
-
-    \note QFileSystemModel requires an instance of a GUI application.
-
     \sa {Model Classes}
 */
 
diff --git a/src/gui/itemviews/qdirmodel.cpp b/src/gui/itemviews/qdirmodel.cpp
index 48599bc..cb6f81e 100644
--- a/src/gui/itemviews/qdirmodel.cpp
+++ b/src/gui/itemviews/qdirmodel.cpp
@@ -201,25 +201,6 @@ void QDirModelPrivate::invalidate()
     QDirModel keeps a cache with file information. The cache needs to be
     updated with refresh().
 
-    A directory model that displays the contents of a default directory
-    is usually constructed with a parent object:
-
-    \snippet doc/src/snippets/shareddirmodel/main.cpp 2
-
-    A tree view can be used to display the contents of the model
-
-    \snippet doc/src/snippets/shareddirmodel/main.cpp 4
-
-    and the contents of a particular directory can be displayed by
-    setting the tree view's root index:
-
-    \snippet doc/src/snippets/shareddirmodel/main.cpp 7
-
-    The view's root index can be used to control how much of a
-    hierarchical model is displayed. QDirModel provides a convenience
-    function that returns a suitable model index for a path to a
-    directory within the model.
-
     QDirModel can be accessed using the standard interface provided by
     QAbstractItemModel, but it also provides some convenience functions
     that are specific to a directory model. The fileInfo() and isDir()
diff --git a/src/gui/kernel/qstandardgestures.cpp b/src/gui/kernel/qstandardgestures.cpp
index 1821c3d..48b7ac1 100644
--- a/src/gui/kernel/qstandardgestures.cpp
+++ b/src/gui/kernel/qstandardgestures.cpp
@@ -194,13 +194,15 @@ QGestureRecognizer::Result QPinchGestureRecognizer::recognize(QGesture *state,
             d->hotSpot = p1.screenPos();
             d->isHotSpotSet = true;
 
+            QPointF centerPoint = (p1.screenPos() + p2.screenPos()) / 2.0;
             if (d->isNewSequence) {
                 d->startPosition[0] = p1.screenPos();
                 d->startPosition[1] = p2.screenPos();
+                d->lastCenterPoint = centerPoint;
+            } else {
+                d->lastCenterPoint = d->centerPoint;
             }
-
-            d->lastCenterPoint = d->centerPoint;
-            d->centerPoint = (p1.screenPos() + p2.screenPos()) / 2.0;
+            d->centerPoint = centerPoint;
 
             d->changeFlags |= QPinchGesture::CenterPointChanged;
 
@@ -224,7 +226,7 @@ QGestureRecognizer::Result QPinchGestureRecognizer::recognize(QGesture *state,
                 startAngle -= 360;
             const qreal rotationAngle = startAngle - angle;
             if (d->isNewSequence)
-                d->lastRotationAngle = rotationAngle;
+                d->lastRotationAngle = 0.0;
             else
                 d->lastRotationAngle = d->rotationAngle;
             d->rotationAngle = rotationAngle;
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 1ef58d8..1ce162c 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -374,6 +374,13 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket
         // - If withCredentials has been set to false (e.g. by QtWebKit for a cross-origin XMLHttpRequest) then
         //   we need to bail out if authentication is required.
         if (priv->phase == QAuthenticatorPrivate::Done || !reply->request().withCredentials()) {
+            // Reset authenticator so the next request on that channel does not get messed up
+            auth = 0;
+            if (isProxy)
+                channels[i].proxyAuthenticator = QAuthenticator();
+            else
+                channels[i].authenticator = QAuthenticator();
+
             // authentication is cancelled, send the current contents to the user.
             emit channels[i].reply->headerChanged();
             emit channels[i].reply->readyRead();
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index 220f7da..73f6b94 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -164,9 +164,13 @@ QAuthenticator &QAuthenticator::operator=(const QAuthenticator &other)
 {
     if (d == other.d)
         return *this;
-    detach();
-    d->user = other.d->user;
-    d->password = other.d->password;
+
+    if (d && !d->ref.deref())
+        delete d;
+
+    d = other.d;
+    if (d)
+        d->ref.ref();
     return *this;
 }
 
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index ae60881..41a8174 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -303,6 +303,8 @@ private Q_SLOTS:
 
     void getFromUnreachableIp();
 
+    void qtbug4121unknownAuthentication();
+
     // NOTE: This test must be last!
     void parentingRepliesToTheApp();
 };
@@ -4870,6 +4872,7 @@ void tst_QNetworkReply::qtbug12908compressedHttpReply()
     QCOMPARE(reply->error(), QNetworkReply::NoError);
 }
 
+// TODO add similar test for FTP
 void tst_QNetworkReply::getFromUnreachableIp()
 {
     QNetworkAccessManager manager;
@@ -4884,6 +4887,35 @@ void tst_QNetworkReply::getFromUnreachableIp()
     QVERIFY(reply->error() != QNetworkReply::NoError);
 }
 
+void tst_QNetworkReply::qtbug4121unknownAuthentication()
+{
+    MiniHttpServer server(QByteArray("HTTP/1.1 401 bla\r\nWWW-Authenticate: crap\r\nContent-Length: 0\r\n\r\n"));
+    server.doClose = false;
+
+    QNetworkRequest request(QUrl("http://localhost:" + QString::number(server.serverPort())));
+    QNetworkAccessManager manager;
+    QNetworkReplyPtr reply = manager.get(request);
+
+    qRegisterMetaType<QNetworkReply*>("QNetworkReply*");
+    qRegisterMetaType<QAuthenticator*>("QAuthenticator*");
+    QSignalSpy authSpy(&manager, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)));
+    QSignalSpy finishedSpy(&manager, SIGNAL(finished(QNetworkReply*)));
+    qRegisterMetaType<QNetworkReply::NetworkError>("QNetworkReply::NetworkError");
+    QSignalSpy errorSpy(reply, SIGNAL(error(QNetworkReply::NetworkError)));
+
+    connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()), Qt::QueuedConnection);
+    QTestEventLoop::instance().enterLoop(10);
+    QVERIFY(!QTestEventLoop::instance().timeout());
+
+    QCOMPARE(authSpy.count(), 0);
+    QCOMPARE(finishedSpy.count(), 1);
+    QCOMPARE(errorSpy.count(), 1);
+
+    QCOMPARE(reply->error(), QNetworkReply::AuthenticationRequiredError);
+}
+
+
+
 // NOTE: This test must be last testcase in tst_qnetworkreply!
 void tst_QNetworkReply::parentingRepliesToTheApp()
 {
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 7b719c8..fb04175 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1929,10 +1929,8 @@ void HtmlGenerator::generateHeader(const QString& title,
         }
     }
 
-#if 0 // Removed for new doc format. MWS
     if (node && !node->links().empty())
-        out() << "<p>\n" << navigationLinks << "</p>\n";
-#endif    
+        out() << "<p>\n" << navigationLinks << "</p><p/>\n";
 }
 
 void HtmlGenerator::generateTitle(const QString& title,
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf
index 58cee4f..4d22964 100644
--- a/tools/qdoc3/test/qt-html-templates.qdocconf
+++ b/tools/qdoc3/test/qt-html-templates.qdocconf
@@ -9,6 +9,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "    <div id=\"nav-logo\">\n" \
 			  "      <a href=\"index.html\">Home</a></div>\n" \
 			  "    <a href=\"index.html\" class=\"qtref\"><span>Qt Reference Documentation</span></a>\n" \
+			  "    <div id="narrowsearch"></div>\n" \
 			  "    <div id=\"nav-topright\">\n" \
 			  "      <ul>\n" \
 			  "        <li class=\"nav-topright-home\"><a href=\"http://qt.nokia.com/\">Qt HOME</a></li>\n" \
@@ -26,6 +27,37 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "        </a></li>\n" \
 			  "      </ul>\n" \
 			  "     </div>\n" \
+			" <ul class=\"sf-menu\" id=\"narrowmenu\"> \n" \
+			" 			<li><a href=\"#\">API Lookup</a> \n" \
+			" 				<ul> \n" \
+			" 					<li><a href=\"classes.html\">Class index</a></li> \n" \
+			"           <li><a href=\"functions.html\">Function index</a></li> \n" \
+			"           <li><a href=\"modules.html\">Modules</a></li> \n" \
+			"           <li><a href=\"namespaces.html\">Namespaces</a></li> \n" \
+			"           <li><a href=\"qtglobal.html\">Global Declarations</a></li> \n" \
+			"           <li><a href=\"qdeclarativeelements.html\">QML elements</a></li> \n" \
+			" 		    </ul> \n" \
+			" 			</li> \n" \
+			" 			<li><a href=\"#\">Qt Topics</a> \n" \
+			" 				<ul> \n" \
+			" 					   <li><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li>  \n" \
+			" 					   <li><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li>  \n" \
+			" 					   <li><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li>  \n" \
+			" 					   <li><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li>  \n" \
+			" 					   <li><a href=\"platform-specific.html\">Platform-specific info</a></li>  \n" \
+			" 					   <li><a href=\"technology-apis.html\">Qt and Key Technologies</a></li>  \n" \
+			" 					   <li><a href=\"best-practices.html\">How-To's and Best Practices</a></li>  \n" \
+			" 		     </ul> \n" \
+			" 				</li> \n" \
+			" 				<li><a href=\"#\">Examples</a> \n" \
+			" 					<ul> \n" \
+			" 		              <li><a href=\"all-examples.html\">Examples</a></li> \n" \
+			" 		              <li><a href=\"tutorials.html\">Tutorials</a></li> \n" \
+			" 		              <li><a href=\"demos.html\">Demos</a></li> \n" \
+			" 		              <li><a href=\"qdeclarativeexamples.html\">QML Examples</a></li> \n" \
+			" 		       </ul> \n" \
+			" 					</li> \n" \
+			" 				</ul> \n" \
 			  "    </div>\n" \
 			  "  </div>\n" \
 			  "  <div class=\"wrapper\">\n" \
@@ -36,7 +68,7 @@ HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
 			  "      <div class=\"sidebar\">\n" \
 			  "        <div class=\"searchlabel\">\n" \
 			  "          Search index:</div>\n" \
-			  "        <div class=\"search\">\n" \
+			  "        <div class=\"search\" id=\"sidebarsearch\">\n" \
 			  "          <form id=\"qtdocsearch\" action=\"\" onsubmit=\"return false;\">\n" \
 			  "            <fieldset>\n" \
 			  "              <input type=\"text\" name=\"searchstring\" id=\"pageType\" value=\"\" />\n" \