Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	configure
	doc/src/snippets/code/doc_src_qmake-manual.qdoc
	mkspecs/features/symbian/application_icon.prf
	mkspecs/features/symbian/default_post.prf
	mkspecs/features/symbian/symbian_building.prf
	qmake/generators/symbian/initprojectdeploy_symbian.cpp
	src/multimedia/audio/audio.pri
	src/network/access/qnetworkaccessmanager.cpp
	src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
	src/opengl/qgl_p.h
	src/plugins/bearer/corewlan/qcorewlanengine.mm
	src/plugins/phonon/mmf/mmf.pro
	tests/auto/qscriptvalue/tst_qscriptvalue.cpp
	tests/auto/qscriptvalue/tst_qscriptvalue.h
	tools/qdoc3/doc/qdoc-manual.qdocconf

18 files changed, 518 insertions, 59 deletions

diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp
index 8520cf7..4896272 100644
--- a/tools/linguist/linguist/mainwindow.cpp
+++ b/tools/linguist/linguist/mainwindow.cpp
@@ -2498,8 +2498,8 @@ void MainWindow::updateDanger(const MultiDataIndex &index, bool verbose)
             }
 
             if (m_ui.actionPlaceMarkerMatches->isChecked()) {
-                // Stores the occurence count of the place markers in the map placeMarkerIndexes.
-                // i.e. the occurence count of %1 is stored at placeMarkerIndexes[1],
+                // Stores the occurrence count of the place markers in the map placeMarkerIndexes.
+                // i.e. the occurrence count of %1 is stored at placeMarkerIndexes[1],
                 // count of %2 is stored at placeMarkerIndexes[2] etc.
                 // In the first pass, it counts all place markers in the sourcetext.
                 // In the second pass it (de)counts all place markers in the translation.
diff --git a/tools/linguist/linguist/printout.cpp b/tools/linguist/linguist/printout.cpp
index 581dc00..7ec6875 100644
--- a/tools/linguist/linguist/printout.cpp
+++ b/tools/linguist/linguist/printout.cpp
@@ -130,7 +130,7 @@ void PrintOut::addBox(int percent, const QString &text, Style style, Qt::Alignme
     cp.rect.setSize(QSize(cp.rect.width() + wd, qMax(cp.rect.height(), ht)));
 }
 
-// use init if inital vsize should be calculated (first breakPage call)
+// use init if initial vsize should be calculated (first breakPage call)
 void PrintOut::breakPage(bool init)
 {
     static const int LeftAlign = Qt::AlignLeft | Qt::AlignTop;
diff --git a/tools/macdeployqt/shared/shared.cpp b/tools/macdeployqt/shared/shared.cpp
index 52cf04b..c7d23c0 100644
--- a/tools/macdeployqt/shared/shared.cpp
+++ b/tools/macdeployqt/shared/shared.cpp
@@ -388,7 +388,7 @@ DeploymentInfo deployQtFrameworks(QList<FrameworkInfo> frameworks,
         foreach (FrameworkInfo dependency, dependencies) {
             changeInstallName(dependency.installName, dependency.deployedInstallName, deployedBinaryPath);
 
-            // Deploy framework if neccesary.
+            // Deploy framework if necessary.
             if (copiedFrameworks.contains(dependency.frameworkName) == false && frameworks.contains(dependency) == false) {
                 frameworks.append(dependency);
             }
diff --git a/tools/porting/src/preprocessorcontrol.cpp b/tools/porting/src/preprocessorcontrol.cpp
index 673ed08..31adc32 100644
--- a/tools/porting/src/preprocessorcontrol.cpp
+++ b/tools/porting/src/preprocessorcontrol.cpp
@@ -154,7 +154,7 @@ QByteArray PreprocessorCache::readFile(const QString &filename) const
     // read the file for us.
     if (receivers(SIGNAL(readFile(QByteArray&,QString))) > 0) {
         QByteArray array;
-        // Workaround for "not beeing able to emit from const function"
+        // Workaround for "not being able to emit from const function"
         PreprocessorCache *cache = const_cast<PreprocessorCache *>(this);
         emit cache->readFile(array, filename);
         return array;
diff --git a/tools/porting/src/textreplacement.h b/tools/porting/src/textreplacement.h
index f90fb82..f351552 100644
--- a/tools/porting/src/textreplacement.h
+++ b/tools/porting/src/textreplacement.h
@@ -53,7 +53,7 @@ class TextReplacement
 public:
     QByteArray newText;
     int insertPosition;
-    int currentLenght;    //lenght of the text that is going to be replaced.
+    int currentLenght;    //length of the text that is going to be replaced.
     bool operator<(const TextReplacement &other) const
     {
         return  (insertPosition < other.insertPosition);
@@ -70,7 +70,7 @@ public:
 
         insert maintains the TextReplacement list in sorted order.
 
-        Returns true if the insert was successfull, false otherwise;
+        Returns true if the insert was successful, false otherwise;
     */
     bool insert(QByteArray newText, int insertPosition, int currentLenght);
     void clear();
diff --git a/tools/qconfig/qconfig.pro b/tools/qconfig/qconfig.pro
index efbfcf2..171924f 100644
--- a/tools/qconfig/qconfig.pro
+++ b/tools/qconfig/qconfig.pro
@@ -6,5 +6,4 @@ build_all:!build_pass {
 }
 HEADERS		= feature.h featuretreemodel.h graphics.h
 SOURCES		= main.cpp feature.cpp featuretreemodel.cpp
-INTERFACES	=
 TARGET		= qconfig
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index a83a321..d43ad96 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -2015,7 +2015,7 @@ void DitaXmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *mark
 }
 
 /*!
-  Generates a table of contents begining at \a node.
+  Generates a table of contents beginning at \a node.
  */
 void DitaXmlGenerator::generateTableOfContents(const Node *node,
                                             CodeMarker *marker,
@@ -2101,7 +2101,7 @@ void DitaXmlGenerator::generateTableOfContents(const Node *node,
 
 /*!
   Revised for the new doc format.
-  Generates a table of contents begining at \a node.
+  Generates a table of contents beginning at \a node.
  */
 void DitaXmlGenerator::generateTableOfContents(const Node *node,
                                             CodeMarker *marker,
diff --git a/tools/qdoc3/doc/qdoc-manual.qdocconf b/tools/qdoc3/doc/qdoc-manual.qdocconf
index 5a725b9..9514d63 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdocconf
+++ b/tools/qdoc3/doc/qdoc-manual.qdocconf
@@ -1,7 +1,7 @@
 project          = QDoc
 description      = QDoc3 Manual
 
-indexes          = $QTDIR/doc/html/qt.index
+indexes          = ../../../doc/html/qt.index
 
 outputdir        = html
 
@@ -9,41 +9,226 @@ sources          = qdoc-manual.qdoc
 sourcedirs       = $PWD
 
 exampledirs     += $PWD \
-                   $QTDIR/examples
+                   ../../../examples
 
 imagedirs       += images
 
 extraimages.HTML = qt-logo
 
-HTML.stylesheets = classic.css
-
-HTML.style       = "h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }\n" \
-                   "a:link { color: #004faf; text-decoration: none }\n" \
-                   "a:visited { color: #672967; text-decoration: none }\n" \
-                   "td.postheader { font-family: sans-serif }\n" \
-                   "tr.address { font-family: sans-serif }\n" \
-                   "body { background: #ffffff; color: black; }"
-
-HTML.postheader  = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"5\" width=\"100%\">\n" \
-                   "<tr>\n" \
-                   "<td align=\"left\" valign=\"top\" width=\"32\">" \
-                   "<a href=\"http://qt.nokia.com/\"><img src=\"images/qt-logo.png\" align=\"left\" border=\"0\" /></a>" \
-                   "</td>\n" \
-                   "<td class=\"postheader\" valign=\"center\">" \
-                   "<a href=\"01-qdoc-manual.html\">" \
-                   "<font color=\"#004faf\">Home: QDoc Manual</font></a>&nbsp;&middot;" \
-                   "<a href=\"http://qt.nokia.com/doc/4.8\">" \
-                   "<font color=\"#004faf\"> Qt Reference Documentation</font></a>" \
-                   "</td>\n" \
-                   "</tr></table>"
-
-HTML.footer     = "<p /><address><hr /><div align=\"center\">\n" \
-                  "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \
-                  "<td width=\"40%\" align=\"left\">Copyright &copy; 2010 Nokia Corporation and/or its subsidiary(-ies)</td>\n" \
-                  "<td width=\"20%\" align=\"center\"><a href=\"trademarks.html\">Trademarks</a></td>\n" \
-                  "<td width=\"40%\" align=\"right\"><div align=\"right\">Qt \\version</div></td>\n" \
-                  "</tr></table></div></address>"
-
-spurious        += "Missing '\\}'" 
-spurious        += "Cannot use .*"
-spurious        += "Unexpected .*"
+HTML.stylesheets        =  style/style.css \
+                           style/OfflineStyle.css \
+                           style/style_ie7.css \
+                           style/style_ie8.css \
+                           style/style_ie6.css
+
+HTML.postheader         = " <div class=\"header\" id=\"qtdocheader\">\n" \
+                          "    <div class=\"content\"> \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" \
+                          "        <li class=\"nav-topright-dev\"><a href=\"http://developer.qt.nokia.com/\">DEV</a></li>\n" \
+                          "        <li class=\"nav-topright-labs\"><a href=\"http://labs.qt.nokia.com/blogs/\">LABS</a></li>\n" \
+                          "        <li class=\"nav-topright-doc nav-topright-doc-active\"><a href=\"http://doc.qt.nokia.com/\">\n" \
+                          "          DOC</a></li>\n" \
+                          "        <li class=\"nav-topright-blog\"><a href=\"http://blog.qt.nokia.com/\">BLOG</a></li>\n" \
+                          "      </ul>\n" \
+                          "    </div>\n" \
+                          "    <div id=\"shortCut\">\n" \
+                          "      <ul>\n" \
+                          "        <li class=\"shortCut-topleft-inactive\"><span><a href=\"index.html\">Qt 4.8</a></span></li>\n" \
+                          "        <li class=\"shortCut-topleft-active\"><a href=\"http://doc.qt.nokia.com\">ALL VERSIONS" \
+                          "        </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" \
+                          "    <div class=\"hd\">\n" \
+                          "      <span></span>\n" \
+                          "    </div>\n" \
+                          "    <div class=\"bd group\">\n" \
+                          "      <div class=\"sidebar\">\n" \
+                          "        <div class=\"searchlabel\">\n" \
+                          "          Search index:</div>\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" \
+                          " <div id=\"resultdialog\"> \n" \
+                          " <a href=\"#\" id=\"resultclose\">Close</a> \n" \
+                          " <p id=\"resultlinks\" class=\"all\"><a href=\"#\" id=\"showallresults\">All</a> | <a href=\"#\" id=\"showapiresults\">API</a> | <a href=\"#\" id=\"showarticleresults\">Articles</a> | <a href=\"#\" id=\"showexampleresults\">Examples</a></p> \n" \
+                          " <p id=\"searchcount\" class=\"all\"><span id=\"resultcount\"></span><span id=\"apicount\"></span><span id=\"articlecount\"></span><span id=\"examplecount\"></span>&nbsp;results:</p> \n" \
+                          " <ul id=\"resultlist\" class=\"all\"> \n" \
+                          " </ul> \n" \
+                          " </div> \n" \
+                          "            </fieldset>\n" \
+                          "          </form>\n" \
+                          "        </div>\n" \
+                          "        <div class=\"box first bottombar\" id=\"lookup\">\n" \
+                          "          <h2 title=\"API Lookup\"><span></span>\n" \
+                          "            API Lookup</h2>\n" \
+                          "          <div  id=\"list001\" class=\"list\">\n" \
+                          "          <ul id=\"ul001\" >\n" \
+                          "              <li class=\"defaultLink\"><a href=\"classes.html\">Class index</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"functions.html\">Function index</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"modules.html\">Modules</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"namespaces.html\">Namespaces</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"qtglobal.html\">Global Declarations</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"qdeclarativeelements.html\">QML elements</a></li>\n" \
+                          "            </ul> \n" \
+                          "          </div>\n" \
+                          "        </div>\n" \
+                          "        <div class=\"box bottombar\" id=\"topics\">\n" \
+                          "          <h2 title=\"Qt Topics\"><span></span>\n" \
+                          "            Qt Topics</h2>\n" \
+                          "          <div id=\"list002\" class=\"list\">\n" \
+                          "            <ul id=\"ul002\" >\n" \
+                          "                           <li class=\"defaultLink\"><a href=\"qt-basic-concepts.html\">Programming with Qt</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"qtquick.html\">Device UIs &amp; Qt Quick</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"qt-gui-concepts.html\">UI Design with Qt</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"developing-with-qt.html\">Cross-platform and Platform-specific</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"platform-specific.html\">Platform-specific info</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"technology-apis.html\">Qt and Key Technologies</a></li> \n" \
+                          "                           <li class=\"defaultLink\"><a href=\"best-practices.html\">How-To's and Best Practices</a></li> \n" \
+                          "            </ul>  \n" \
+                          "          </div>\n" \
+                          "        </div>\n" \
+                          "        <div class=\"box\" id=\"examples\">\n" \
+                          "          <h2 title=\"Examples\"><span></span>\n" \
+                          "            Examples</h2>\n" \
+                          "          <div id=\"list003\" class=\"list\">\n" \
+                          "        <ul id=\"ul003\">\n" \
+                          "              <li class=\"defaultLink\"><a href=\"all-examples.html\">Examples</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"tutorials.html\">Tutorials</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"demos.html\">Demos</a></li>\n" \
+                          "              <li class=\"defaultLink\"><a href=\"qdeclarativeexamples.html\">QML Examples</a></li>\n" \
+                          "            </ul> \n" \
+                          "          </div>\n" \
+                          "        </div>\n" \
+                          "      </div>\n" \
+                          "      <div class=\"wrap\">\n" \
+                          "        <div class=\"toolbar\">\n" \
+                          "          <div class=\"breadcrumb toolblock\">\n" \
+                          "            <ul>\n" \
+                          "              <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \
+                          "              <!--  Bread crumbs goes here -->\n"
+
+HTML.postpostheader     = "            </ul>\n" \
+                          "          </div>\n" \
+                          "          <div class=\"toolbuttons toolblock\">\n" \
+                          "            <ul>\n" \
+                          "              <li id=\"smallA\" class=\"t_button\">A</li>\n" \
+                          "              <li id=\"medA\" class=\"t_button active\">A</li>\n" \
+                          "              <li id=\"bigA\" class=\"t_button\">A</li>\n" \
+                          "              <li id=\"print\" class=\"t_button\"><a href=\"javascript:this.print();\">\n" \
+                          "                <span>Print</span></a></li>\n" \
+                          "            </ul>\n" \
+                          "        </div>\n" \
+                          "        </div>\n" \
+                          "        <div class=\"content mainContent\">\n"
+
+HTML.footer             = "" \
+                          "        <div class=\"feedback t_button\">\n" \
+                          "          [+] Documentation Feedback</div>\n" \
+                          "      </div>\n" \
+                          "    </div>\n" \
+                          "    </div> \n" \
+                          "    <div class=\"ft\">\n" \
+                          "      <span></span>\n" \
+                          "    </div>\n" \
+                          "  </div> \n" \
+                          "  <div class=\"footer\">\n" \
+                          "    <p>\n" \
+                          "      <acronym title=\"Copyright\">&copy;</acronym> 2008-2010 Nokia Corporation and/or its\n" \
+                          "      subsidiaries. Nokia, Qt and their respective logos are trademarks of Nokia Corporation \n" \
+                          "      in Finland and/or other countries worldwide.</p>\n" \
+                          "    <p>\n" \
+                          "      All other trademarks are property of their respective owners. <a title=\"Privacy Policy\"\n" \
+                          "        href=\"http://qt.nokia.com/about/privacy-policy\">Privacy Policy</a></p>\n" \
+                          "    <br />\n" \
+                          "    <p>\n" \
+                          "      Licensees holding valid Qt Commercial licenses may use this document in accordance with the" \
+                          "      Qt Commercial License Agreement provided with the Software or, alternatively, in accordance" \
+                          "      with the terms contained in a written agreement between you and Nokia.</p>\n" \
+                          "    <p>\n" \
+                          "      Alternatively, this document may be used under the terms of the <a href=\"http://www.gnu.org/licenses/fdl.html\">GNU\n" \
+                          "      Free Documentation License version 1.3</a>\n" \
+                          "      as published by the Free Software Foundation.</p>\n" \
+                          "  </div>\n" \
+                          "  <div id=\"feedbackBox\">\n" \
+                          "      <div id=\"feedcloseX\" class=\"feedclose t_button\">X</div>\n" \
+                          "    <form id=\"feedform\" action=\"http://doc.qt.nokia.com/docFeedbck/feedback.php\" method=\"get\">\n" \
+                          "      <p id=\"noteHead\">Thank you for giving your feedback.</p> <p class=\"note\">Make sure it is related to this specific page. For more general bugs and \n" \
+                          "      requests, please use the <a href=\"http://bugreports.qt.nokia.com/secure/Dashboard.jspa\">Qt Bug Tracker</a>.</p>\n" \
+                          "      <p><textarea id=\"feedbox\" name=\"feedText\" rows=\"5\" cols=\"40\"></textarea></p>\n" \
+                          "      <p><input id=\"feedsubmit\" class=\"feedclose\" type=\"submit\" name=\"feedback\" /></p>\n" \
+                          "    </form>\n" \
+                          "  </div>\n" \
+                          "  <div id=\"blurpage\">\n" \
+                          "  </div>\n" 
+
+# This stuff is used by the Qt 4.7 doc format.
+scriptdirs              = ../../../doc/src/template/scripts
+styledirs               = ../../../doc/src/template/style
+
+scripts.HTML		= functions.js \
+			  narrow.js \
+			  superfish.js \
+			  jquery.js
+
+styles.HTML		= style.css \
+			  narrow.css \
+			  superfish.css \
+			  superfish_skin.css \
+			  style_ie6.css \
+			  style_ie7.css \
+			  style_ie8.css
+
+# Files not referenced in any qdoc file (last four are needed by qtdemo)
+# See also extraimages.HTML
+qhp.Qt.extraFiles          = scripts/functions.js \
+                             scripts/jquery.js \
+                             scripts/narrow.js \
+                             scripts/superfish.js \
+                             style/narrow.css \
+                             style/superfish.css \
+                             style/style_ie6.css \
+                             style/style_ie7.css \
+                             style/style_ie8.css \
+                             style/style.css
+
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index fb04175..9e45f8c 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -1930,7 +1930,7 @@ void HtmlGenerator::generateHeader(const QString& title,
     }
 
     if (node && !node->links().empty())
-        out() << "<p>\n" << navigationLinks << "</p><p/>\n";
+        out() << "<p class=\"naviNextPrevious headerNavi\">\n" << navigationLinks << "</p><p/>\n";
 }
 
 void HtmlGenerator::generateTitle(const QString& title,
@@ -1955,7 +1955,7 @@ void HtmlGenerator::generateTitle(const QString& title,
 void HtmlGenerator::generateFooter(const Node *node)
 {
     if (node && !node->links().empty())
-        out() << "<p>\n" << navigationLinks << "</p>\n";
+        out() << "<p class=\"naviNextPrevious footerNavi\">\n" << navigationLinks << "</p>\n";
 
     out() << QString(footer).replace("\\" + COMMAND_VERSION, myTree->version())
           << QString(address).replace("\\" + COMMAND_VERSION, myTree->version());
@@ -3719,7 +3719,11 @@ void HtmlGenerator::findAllClasses(const InnerNode *node)
                      (*c)->subType() == Node::QmlClass &&
                      !(*c)->doc().isEmpty()) {
                 QString qmlClassName = (*c)->name();
-                qmlClasses.insert(qmlClassName,*c);
+                // Remove the "QML:" prefix if present.
+                if (qmlClassName.startsWith(QLatin1String("QML:")))
+                    qmlClasses.insert(qmlClassName.mid(4),*c);
+                else
+                    qmlClasses.insert(qmlClassName,*c);
             }
             else if ((*c)->isInnerNode()) {
                 findAllClasses(static_cast<InnerNode *>(*c));
diff --git a/tools/qdoc3/tokenizer.h b/tools/qdoc3/tokenizer.h
index bd35965..1b33f6f 100644
--- a/tools/qdoc3/tokenizer.h
+++ b/tools/qdoc3/tokenizer.h
@@ -145,7 +145,7 @@ class Tokenizer
         int ch = getch();
         if (ch == EOF)
             return EOF;
-        // cast explicitely to make sure the value of ch 
+        // cast explicitly to make sure the value of ch 
         // is in range [0..255] to avoid assert messages 
         // when using debug CRT that checks its input.
         return int(uint(uchar(ch))); 
diff --git a/tools/qmeegographicssystemhelper/qmeegofencesync.cpp b/tools/qmeegographicssystemhelper/qmeegofencesync.cpp
new file mode 100644
index 0000000..499e102
--- /dev/null
+++ b/tools/qmeegographicssystemhelper/qmeegofencesync.cpp
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmeegofencesync.h"
+#include "qmeegofencesync_p.h"
+#include "qmeegoruntime.h"
+
+/* QMeeGoFenceSyncPrivate */
+
+QMeeGoFenceSyncPrivate::QMeeGoFenceSyncPrivate() : syncObject(NULL)
+{
+}
+
+QMeeGoFenceSyncPrivate::~QMeeGoFenceSyncPrivate()
+{
+    if (syncObject) {
+        QMeeGoRuntime::destroyFenceSync(syncObject);
+        syncObject = NULL;
+    }
+}
+
+/* QMeeGoFenceSync */
+
+QMeeGoFenceSync::QMeeGoFenceSync(QWidget *parent) : QObject(parent), d_ptr(new QMeeGoFenceSyncPrivate())
+{
+    Q_D(QMeeGoFenceSync);
+    d->q_ptr = this;
+}
+
+QMeeGoFenceSync::~QMeeGoFenceSync()
+{
+}
+
+void QMeeGoFenceSync::setSyncPoint()
+{
+    Q_D(QMeeGoFenceSync);
+    if (d->syncObject)
+        QMeeGoRuntime::destroyFenceSync(d->syncObject);
+
+    d->syncObject = QMeeGoRuntime::createFenceSync();
+}
diff --git a/tools/qmeegographicssystemhelper/qmeegofencesync.h b/tools/qmeegographicssystemhelper/qmeegofencesync.h
new file mode 100644
index 0000000..2d3f5c5
--- /dev/null
+++ b/tools/qmeegographicssystemhelper/qmeegofencesync.h
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMEEGOFENCESYNC_H
+#define QMEEGOFENCESYNC_H
+
+#include <QWidget>
+
+class QMeeGoFenceSyncPrivate;
+
+//! A synchronization helper for GL pipeline.
+/*!
+ Fence syncs provide a mechanism for synchronizing access to certain GL primitives
+ and make it possible for the application developer to be sure that a certain point
+ in the GL processing pipeline has been already executed before continuing operation.
+
+ Currently fence syncs are only useful in conjunction with QMeeGoLivePixmaps.
+ \code
+ ...
+ // In your paint/expose event:
+ QImage *image = livePixmap->lock(&someGlobalFenceSync);
+ // Modify the image...
+ livePixmap->release(image);
+
+ painter->drawPixmap(0, 0, *livePixmap);
+ someGlobalFenceSync.setSyncPoint();
+ ...
+ \endcode
+
+ Assuming the paint/expose events come repeatedly, the lock operation
+ will block till the previous event completed painting the livePixmap.
+*/
+
+class Q_DECL_EXPORT QMeeGoFenceSync : public QObject
+{
+public:
+    //! Constructs a new fence sync.
+    /*!
+     The fence sync is created without a sync point. You need to set the sync point manually.
+    */
+    QMeeGoFenceSync(QWidget *parent = 0);
+
+    //! Destructor for the fence sync.
+    virtual ~QMeeGoFenceSync();
+
+    //! Sets the fence sync.
+    /*!
+      The fence sync synchronization point should be set after all drawing has been scheduled.
+      Setting a synchronization point always overrides the previous point -- whetver is was
+      used (waited upon) or not.
+    */
+    void setSyncPoint();
+
+private:
+    Q_DISABLE_COPY(QMeeGoFenceSync)
+    Q_DECLARE_PRIVATE(QMeeGoFenceSync)
+
+protected:
+    QScopedPointer<QMeeGoFenceSyncPrivate> d_ptr; //! Private bits.
+    friend class QMeeGoLivePixmap;
+};
+
+#endif
diff --git a/tools/qmeegographicssystemhelper/qmeegofencesync_p.h b/tools/qmeegographicssystemhelper/qmeegofencesync_p.h
new file mode 100644
index 0000000..8a5d26e
--- /dev/null
+++ b/tools/qmeegographicssystemhelper/qmeegofencesync_p.h
@@ -0,0 +1,60 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qmeegofencesync.h"
+
+#ifndef QMEEGOFENCESYNC_P_H
+#define QMEEGOFENCESYNC_P_H
+
+class QMeeGoFenceSyncPrivate
+{
+public:
+    Q_DECLARE_PUBLIC(QMeeGoFenceSync);
+    QMeeGoFenceSyncPrivate();
+
+    virtual ~QMeeGoFenceSyncPrivate();
+
+    void* syncObject;
+
+    QMeeGoFenceSync *q_ptr;
+};
+
+#endif
diff --git a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.pro b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.pro
index 7412fc3..161a31b 100644
--- a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.pro
+++ b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.pro
@@ -6,5 +6,5 @@ include(../../src/qbase.pri)
 QT += gui
 INCLUDEPATH += '../../src/plugins/graphicssystems/meego'
 
-HEADERS = qmeegographicssystemhelper.h qmeegooverlaywidget.h qmeegolivepixmap.h qmeegoruntime.h qmeegolivepixmap_p.h
-SOURCES = qmeegographicssystemhelper.cpp qmeegooverlaywidget.cpp qmeegoruntime.cpp qmeegolivepixmap.cpp qmeegographicssystemhelper.h qmeegooverlaywidget.h qmeegolivepixmap.h qmeegoruntime.h qmeegolivepixmap_p.h
+HEADERS = qmeegographicssystemhelper.h qmeegooverlaywidget.h qmeegolivepixmap.h qmeegoruntime.h qmeegolivepixmap_p.h qmeegofencesync.h qmeegofencesync_p.h
+SOURCES = qmeegographicssystemhelper.cpp qmeegooverlaywidget.cpp qmeegoruntime.cpp qmeegolivepixmap.cpp qmeegographicssystemhelper.h qmeegooverlaywidget.h qmeegolivepixmap.h qmeegoruntime.h qmeegolivepixmap_p.h qmeegofencesync.h qmeegofencesync_p.h qmeegofencesync.cpp
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
index d43efe2..9700581f 100644
--- a/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap.cpp
@@ -41,6 +41,7 @@
 
 #include "qmeegolivepixmap.h"
 #include "qmeegolivepixmap_p.h"
+#include "qmeegofencesync_p.h"
 #include "qmeegoruntime.h"
 
 /* QMeeGoLivePixmapPrivate */
@@ -102,10 +103,12 @@ QMeeGoLivePixmap::~QMeeGoLivePixmap()
 {
 }
 
-QImage* QMeeGoLivePixmap::lock()
+QImage* QMeeGoLivePixmap::lock(QMeeGoFenceSync *fenceSync)
 {
-    return QMeeGoRuntime::lockLiveTexture(this);
-
+    if (fenceSync)
+        return QMeeGoRuntime::lockLiveTexture(this, fenceSync->d_func()->syncObject);
+    else
+        return QMeeGoRuntime::lockLiveTexture(this, NULL);
 }
 
 void QMeeGoLivePixmap::release(QImage *img)
diff --git a/tools/qmeegographicssystemhelper/qmeegolivepixmap.h b/tools/qmeegographicssystemhelper/qmeegolivepixmap.h
index 7be2c4b..51b5976 100644
--- a/tools/qmeegographicssystemhelper/qmeegolivepixmap.h
+++ b/tools/qmeegographicssystemhelper/qmeegolivepixmap.h
@@ -43,6 +43,7 @@
 #define QMEEGOLIVEPIXMAP_H
 
 #include <QPixmap>
+#include "qmeegofencesync.h"
 
 class QMeeGoLivePixmapPrivate;
 class QSharedMemory;
@@ -82,8 +83,12 @@ public:
     //! Locks the access to the pixmap. 
     /*! 
      The returned image can be used for direct access.
+     You can optionally specify a fence sync to wait upon before unlocking. When
+     you specify a fence sync, you can be sure that this function will return only
+     when the previsouly set QMeeGoFenceSync synchronization point has been executed/passed
+     by the GL processing pipeline.
      */
-    QImage* lock();
+    QImage* lock(QMeeGoFenceSync *fenceSync = NULL);
     
     //! Unlocks the access to the pixmap. 
     /*! 
diff --git a/tools/qmeegographicssystemhelper/qmeegoruntime.cpp b/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
index ac627e5..2d3ee3c 100644
--- a/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
+++ b/tools/qmeegographicssystemhelper/qmeegoruntime.cpp
@@ -60,9 +60,11 @@ typedef void (*QMeeGoSetSurfaceScalingFunc) (int x, int y, int w, int h);
 typedef void (*QMeeGoSetTranslucentFunc) (bool translucent);
 typedef QPixmapData* (*QMeeGoPixmapDataWithNewLiveTextureFunc) (int w, int h, QImage::Format format);
 typedef QPixmapData* (*QMeeGoPixmapDataFromLiveTextureHandleFunc) (Qt::HANDLE h);
-typedef QImage* (*QMeeGoLiveTextureLockFunc) (QPixmap*);
+typedef QImage* (*QMeeGoLiveTextureLockFunc) (QPixmap*, void* fenceSync);
 typedef bool (*QMeeGoLiveTextureReleaseFunc) (QPixmap*, QImage *i);
 typedef Qt::HANDLE (*QMeeGoLiveTextureGetHandleFunc) (QPixmap*);
+typedef void* (*QMeeGoCreateFenceSyncFunc) (void);
+typedef void (*QMeeGoDestroyFenceSyncFunc) (void *fs);
 
 static QMeeGoImageToEglSharedImageFunc qt_meego_image_to_egl_shared_image = NULL;
 static QMeeGoPixmapDataFromEglSharedImageFunc qt_meego_pixmapdata_from_egl_shared_image = NULL;
@@ -77,6 +79,8 @@ static QMeeGoPixmapDataFromLiveTextureHandleFunc qt_meego_pixmapdata_from_live_t
 static QMeeGoLiveTextureLockFunc qt_meego_live_texture_lock = NULL;
 static QMeeGoLiveTextureReleaseFunc qt_meego_live_texture_release = NULL;
 static QMeeGoLiveTextureGetHandleFunc qt_meego_live_texture_get_handle = NULL;
+static QMeeGoCreateFenceSyncFunc qt_meego_create_fence_sync = NULL;
+static QMeeGoDestroyFenceSyncFunc qt_meego_destroy_fence_sync = NULL;
 
 void QMeeGoRuntime::initialize()
 {
@@ -103,12 +107,15 @@ void QMeeGoRuntime::initialize()
         qt_meego_live_texture_lock = (QMeeGoLiveTextureLockFunc) library.resolve("qt_meego_live_texture_lock");
         qt_meego_live_texture_release = (QMeeGoLiveTextureReleaseFunc) library.resolve("qt_meego_live_texture_release");
         qt_meego_live_texture_get_handle = (QMeeGoLiveTextureGetHandleFunc) library.resolve("qt_meego_live_texture_get_handle");
+        qt_meego_create_fence_sync = (QMeeGoCreateFenceSyncFunc) library.resolve("qt_meego_create_fence_sync");
+        qt_meego_destroy_fence_sync = (QMeeGoDestroyFenceSyncFunc) library.resolve("qt_meego_destroy_fence_sync");
 
         if (qt_meego_image_to_egl_shared_image && qt_meego_pixmapdata_from_egl_shared_image && 
             qt_meego_pixmapdata_with_gl_texture && qt_meego_destroy_egl_shared_image && qt_meego_update_egl_shared_image_pixmap && 
             qt_meego_set_surface_fixed_size && qt_meego_set_surface_scaling && qt_meego_set_translucent && 
             qt_meego_pixmapdata_with_new_live_texture && qt_meego_pixmapdata_from_live_texture_handle &&
-            qt_meego_live_texture_lock && qt_meego_live_texture_release && qt_meego_live_texture_get_handle)
+            qt_meego_live_texture_lock && qt_meego_live_texture_release && qt_meego_live_texture_get_handle &&
+            qt_meego_create_fence_sync && qt_meego_destroy_fence_sync)
         {
             qDebug("Successfully resolved MeeGo graphics system: %s %s\n", qPrintable(libraryPrivate->fileName), qPrintable(libraryPrivate->fullVersion));
         } else {
@@ -191,11 +198,11 @@ QPixmapData* QMeeGoRuntime::pixmapDataFromLiveTextureHandle(Qt::HANDLE h)
     return qt_meego_pixmapdata_from_live_texture_handle(h);
 }
 
-QImage* QMeeGoRuntime::lockLiveTexture(QPixmap *p)
+QImage* QMeeGoRuntime::lockLiveTexture(QPixmap *p, void* fenceSync)
 {
     ENSURE_INITIALIZED;
     Q_ASSERT(qt_meego_live_texture_lock);
-    return qt_meego_live_texture_lock(p);
+    return qt_meego_live_texture_lock(p, fenceSync);
 }
 
 bool QMeeGoRuntime::releaseLiveTexture(QPixmap *p, QImage *i)
@@ -211,3 +218,17 @@ Qt::HANDLE QMeeGoRuntime::getLiveTextureHandle(QPixmap *pixmap)
     Q_ASSERT(qt_meego_live_texture_get_handle);
     return qt_meego_live_texture_get_handle(pixmap);
 }
+
+void* QMeeGoRuntime::createFenceSync()
+{
+    ENSURE_INITIALIZED;
+    Q_ASSERT(qt_meego_create_fence_sync);
+    return qt_meego_create_fence_sync();
+}
+
+void QMeeGoRuntime::destroyFenceSync(void *fs)
+{
+    ENSURE_INITIALIZED;
+    Q_ASSERT(qt_meego_destroy_fence_sync);
+    qt_meego_destroy_fence_sync(fs);
+}
diff --git a/tools/qmeegographicssystemhelper/qmeegoruntime.h b/tools/qmeegographicssystemhelper/qmeegoruntime.h
index 6b34836..be6ff6b 100644
--- a/tools/qmeegographicssystemhelper/qmeegoruntime.h
+++ b/tools/qmeegographicssystemhelper/qmeegoruntime.h
@@ -57,9 +57,11 @@ public:
     static void setTranslucent(bool translucent);
     static QPixmapData* pixmapDataWithNewLiveTexture(int w, int h, QImage::Format format);
     static QPixmapData* pixmapDataFromLiveTextureHandle(Qt::HANDLE h);
-    static QImage* lockLiveTexture(QPixmap *pixmap);
+    static QImage* lockLiveTexture(QPixmap *pixmap, void *fenceSync);
     static bool releaseLiveTexture(QPixmap *pixmap, QImage *image);
     static Qt::HANDLE getLiveTextureHandle(QPixmap *pixmap);
+    static void* createFenceSync();
+    static void destroyFenceSync(void *fs);
 
 private:
     static bool initialized;