Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (48 commits)
  qmake: delete .pdb file when making 'distclean' instead of 'clean'
  qmake: pass include directories to MS resource compiler
  use specified pkg-config
  qmake/symbian: Add icons with backslashes in pkg files
  Make qtconfig help messages translatable
  remove exec bits again ...
  Add TIFFClose to QTIffHandler::option() to avoid memory leak
  [QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
  Added missing QtWebKit example files and some whitespace fixes.
  Added missing native separator transforms.
  Doc: tuning search reasult box
  qdoc: Don't generate html output for png files.
  Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
  Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
  Doc: correct spelling
  Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
  Doc: correcting grammar on the installation pages
  Doc: correcting broken link to labs
  Doc: adding note to function QWSKeyboardHandler::processKeycode  - that it was added in Qt 4.6
  Doc: correcting typo
  ...

15 files changed, 132 insertions, 134 deletions

diff --git a/tools/assistant/tools/assistant/doc/assistant.qdoc b/tools/assistant/tools/assistant/doc/assistant.qdoc
index 129e60d..eda2063 100644
--- a/tools/assistant/tools/assistant/doc/assistant.qdoc
+++ b/tools/assistant/tools/assistant/doc/assistant.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file 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.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/tools/designer/src/lib/sdk/abstractdnditem.qdoc b/tools/designer/src/lib/sdk/abstractdnditem.qdoc
index bdae59c..0d63954 100644
--- a/tools/designer/src/lib/sdk/abstractdnditem.qdoc
+++ b/tools/designer/src/lib/sdk/abstractdnditem.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file 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.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/tools/designer/src/lib/sdk/abstracticoncache.qdoc b/tools/designer/src/lib/sdk/abstracticoncache.qdoc
index 6eb6b13..467eca2 100644
--- a/tools/designer/src/lib/sdk/abstracticoncache.qdoc
+++ b/tools/designer/src/lib/sdk/abstracticoncache.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file 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.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/tools/designer/src/lib/sdk/dynamicpropertysheet.qdoc b/tools/designer/src/lib/sdk/dynamicpropertysheet.qdoc
index b813c16..93690cd 100644
--- a/tools/designer/src/lib/sdk/dynamicpropertysheet.qdoc
+++ b/tools/designer/src/lib/sdk/dynamicpropertysheet.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file 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.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/tools/designer/src/lib/sdk/layoutdecoration.qdoc b/tools/designer/src/lib/sdk/layoutdecoration.qdoc
index 1b38975..1dacbb2 100644
--- a/tools/designer/src/lib/sdk/layoutdecoration.qdoc
+++ b/tools/designer/src/lib/sdk/layoutdecoration.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file 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.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/tools/designer/src/lib/sdk/membersheet.qdoc b/tools/designer/src/lib/sdk/membersheet.qdoc
index 7185579..f9d76cf 100644
--- a/tools/designer/src/lib/sdk/membersheet.qdoc
+++ b/tools/designer/src/lib/sdk/membersheet.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file 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.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/tools/designer/src/lib/sdk/propertysheet.qdoc b/tools/designer/src/lib/sdk/propertysheet.qdoc
index 8c49087..ab2477b 100644
--- a/tools/designer/src/lib/sdk/propertysheet.qdoc
+++ b/tools/designer/src/lib/sdk/propertysheet.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file 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.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/tools/designer/src/lib/sdk/taskmenu.qdoc b/tools/designer/src/lib/sdk/taskmenu.qdoc
index 23ea1b2..68854b3 100644
--- a/tools/designer/src/lib/sdk/taskmenu.qdoc
+++ b/tools/designer/src/lib/sdk/taskmenu.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file 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.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/tools/designer/src/lib/uilib/container.qdoc b/tools/designer/src/lib/uilib/container.qdoc
index a3bbcc6..cea5a45 100644
--- a/tools/designer/src/lib/uilib/container.qdoc
+++ b/tools/designer/src/lib/uilib/container.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file 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.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/tools/designer/src/lib/uilib/customwidget.qdoc b/tools/designer/src/lib/uilib/customwidget.qdoc
index cdbdfa2..88c169a 100644
--- a/tools/designer/src/lib/uilib/customwidget.qdoc
+++ b/tools/designer/src/lib/uilib/customwidget.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file 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.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
index d9343e3..a259096 100644
--- a/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
+++ b/tools/qdbus/qdbusxml2cpp/qdbusxml2cpp.cpp
@@ -1130,11 +1130,11 @@ int main(int argc, char **argv)
     static code representing those interfaces, which can then be used to make calls to remote
     objects or implement said interfaces.
 
-    \c qdbusxml2dcpp has two modes of operation, that correspond to the two possible outputs it can
+    \c qdbusxml2cpp has two modes of operation, that correspond to the two possible outputs it can
     produce: the interface (proxy) class or the adaptor class. The latter consists of both a C++
     header and a source file, which are meant to be edited and adapted to your needs.
 
-    The \c qdbusxml2dcpp tool is not meant to be run every time you compile your
+    The \c qdbusxml2cpp tool is not meant to be run every time you compile your
     application. Instead, it's meant to be used when developing the code or when the interface
     changes.
 
diff --git a/tools/qdoc3/doc/qdoc-manual.qdoc b/tools/qdoc3/doc/qdoc-manual.qdoc
index c3ab731..b557ad9 100644
--- a/tools/qdoc3/doc/qdoc-manual.qdoc
+++ b/tools/qdoc3/doc/qdoc-manual.qdoc
@@ -7,11 +7,11 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file 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.
+** 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 Free Documentation License
 ** Alternatively, this file may be used under the terms of the GNU Free
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 77e306a..c804d09 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -451,7 +451,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
 {
     int skipAhead = 0;
     static bool in_para = false;
-	
+
     switch (atom->type()) {
     case Atom::AbstractLeft:
         break;
@@ -527,18 +527,18 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << formattingRightMap()[ATOM_FORMATTING_TELETYPE];
         break;
     case Atom::Code:
-	out() << "<pre class=\"highlightedCode brush: cpp\">"
+        out() << "<pre class=\"highlightedCode brush: cpp\">"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "</pre>\n";
-	break;
+        break;
 #ifdef QDOC_QML
     case Atom::Qml:
-	out() << "<pre class=\"highlightedCode brush: cpp\">"
+        out() << "<pre class=\"highlightedCode brush: cpp\">"
               << trimmedTrailing(highlightedCode(indent(codeIndent,atom->string()),
                                                  marker,relative))
               << "</pre>\n";
-	break;
+        break;
 #endif
     case Atom::CodeNew:
         out() << "<p>you can rewrite it as</p>\n"
@@ -554,7 +554,7 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         out() << "<pre class=\"highlightedCode brush: cpp\">"
               << trimmedTrailing(protectEnc(plainCode(indent(codeIndent,atom->string()))))
               << "</pre>\n";
-	break;
+        break;
     case Atom::FootnoteLeft:
         // ### For now
         if (in_para) {
@@ -927,13 +927,12 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             threeColumnEnumValueTable = isThreeColumnEnumValueTable(atom);
             if (threeColumnEnumValueTable) {
                 out() << "<table class=\"valuelist\">";
-                    //  << "<tr>"
-				if (++numTableRows % 2 == 1)
-					out() << "<tr class=\"odd\">";
-				else
-					out() << "<tr class=\"even\">";
+                if (++numTableRows % 2 == 1)
+                        out() << "<tr class=\"odd\">";
+                else
+                        out() << "<tr class=\"even\">";
 
-					out() << "<tr><th class=\"tblConst\">Constant</th>"
+                out() << "<th class=\"tblConst\">Constant</th>"
                       << "<th class=\"tblval\">Value</th>"
                       << "<th class=\"tbldscr\">Description</th></tr>\n";
             }
@@ -1811,44 +1810,44 @@ void HtmlGenerator::generateHeader(const QString& title,
     out() << "  <script src=\"scripts/jquery.js\" type=\"text/javascript\"></script>\n";
     out() << "  <script src=\"scripts/functions.js\" type=\"text/javascript\"></script>\n";
 
-	
-    // Adding syntax highlighter 	// future release
-	
+
+    // Adding syntax highlighter         // future release
+
     // Setting some additional style sheet related details depending on configuration (e.g. Online/Creator)
 
     switch (application) {
     case Online:
     // Adding style and js for small windows
-    out() << "  <script src=\"./scripts/superfish.js\" type=\"text/javascript\"></script>\n";
-    out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/superfish.css\" />";
-    out() << "  <script src=\"./scripts/narrow.js\" type=\"text/javascript\"></script>\n";
-    out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />\n";	
+        out() << "  <script src=\"./scripts/superfish.js\" type=\"text/javascript\"></script>\n";
+        out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/superfish.css\" />";
+        out() << "  <script src=\"./scripts/narrow.js\" type=\"text/javascript\"></script>\n";
+        out() << "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/narrow.css\" />\n";
         // Browser spec styles
-	out() << "  <!--[if IE]>\n";
-	out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n";
-	out() << "<meta http-equiv=\"imagetoolbar\" content=\"no\">\n";
-	out() << "<![endif]-->\n";
-	out() << "<!--[if lt IE 7]>\n";
-	out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">\n";
-	out() << "<![endif]-->\n";
-	out() << "<!--[if IE 7]>\n";
-	out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">\n";
-	out() << "<![endif]-->\n";
-	out() << "<!--[if IE 8]>\n";
-	out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">\n";
-	out() << "<![endif]-->\n";
-		
-	out() << "</head>\n";
-	// CheckEmptyAndLoadList activating search
-	out() << "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n";
+        out() << "  <!--[if IE]>\n";
+        out() << "<meta name=\"MSSmartTagsPreventParsing\" content=\"true\">\n";
+        out() << "<meta http-equiv=\"imagetoolbar\" content=\"no\">\n";
+        out() << "<![endif]-->\n";
+        out() << "<!--[if lt IE 7]>\n";
+        out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie6.css\">\n";
+        out() << "<![endif]-->\n";
+        out() << "<!--[if IE 7]>\n";
+        out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie7.css\">\n";
+        out() << "<![endif]-->\n";
+        out() << "<!--[if IE 8]>\n";
+        out() << "<link rel=\"stylesheet\" type=\"text/css\" href=\"style/style_ie8.css\">\n";
+        out() << "<![endif]-->\n";
+
+        out() << "</head>\n";
+        // CheckEmptyAndLoadList activating search
+        out() << "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n";
         break;
     case Creator:
-	out() << "</head>\n";
-	out() << "<body class=\"offline narrow creator\">\n"; // offline narrow
+        out() << "</head>\n";
+        out() << "<body class=\"offline narrow creator\">\n"; // offline narrow
         break;
     default:
-	out() << "</head>\n";
-	out() << "<body>\n";
+        out() << "</head>\n";
+        out() << "<body>\n";
         break;
     }
 
@@ -1866,7 +1865,7 @@ void HtmlGenerator::generateHeader(const QString& title,
     case Creator:
         out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
         generateBreadCrumbs(title,node,marker);
-        out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());	
+        out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
         break;
     default: // default -- not used except if one forgets to set any of the above settings to true
         out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
@@ -1945,8 +1944,8 @@ void HtmlGenerator::generateTitle(const QString& title,
     if (!title.isEmpty())
         out() << "<h1 class=\"title\">" << protectEnc(title) << "</h1>\n";
     if (!subTitle.isEmpty()) {
- 			out() << "<span";
-       if (subTitleSize == SmallSubTitle)
+        out() << "<span";
+        if (subTitleSize == SmallSubTitle)
             out() << " class=\"small-subtitle\">";
         else
             out() << " class=\"subtitle\">";
@@ -1979,10 +1978,10 @@ void HtmlGenerator::generateFooter(const Node *node)
         out() << "  })();\n";
         out() << "  </script>\n";
         out() << "</body>\n";
-	break;
+        break;
     case Creator:
         out() << "</body>\n";
-	break;
+        break;
     default:
         out() << "</body>\n";
     }
@@ -2238,20 +2237,19 @@ void HtmlGenerator::generateNavigationBar(const NavigationBar& bar,
             out() << "</a>]\n";
 #endif
         }
-		if (fake->name() != QString("index.html"))
-			{
-        if (bar.current.begin() != 0) {
-            out() << "[<a href=\"" << "home"
-                  << ".html\">Home</a>]\n";
-        }
-        if (bar.next.begin() != 0) {
-            out() << "[<a href=\"" << fileBase(node, bar.next)
-                  << ".html\">Next: ";
-            generateText(Text::sectionHeading(bar.next.begin()), node, marker);
-            out() << "</a>]\n";
+        if (fake->name() != QString("index.html")) {
+            if (bar.current.begin() != 0) {
+                out() << "[<a href=\"" << "home"
+                      << ".html\">Home</a>]\n";
+            }
+            if (bar.next.begin() != 0) {
+                out() << "[<a href=\"" << fileBase(node, bar.next)
+                      << ".html\">Next: ";
+                generateText(Text::sectionHeading(bar.next.begin()), node, marker);
+                out() << "</a>]\n";
+            }
+            out() << "</p>\n";
         }
-        out() << "</p>\n";
-		}
     }
 }
 #endif
@@ -3283,7 +3281,7 @@ void HtmlGenerator::generateLink(const Atom* atom,
         inLink = false;
         out() << protectEnc(atom->string().mid(k));
     } else if (marker->recognizeLanguage("Java")) {
-	// hack for Java: remove () and use <tt> when appropriate
+        // hack for Java: remove () and use <tt> when appropriate
         bool func = atom->string().endsWith("()");
         bool tt = (func || atom->string().contains(camelCase));
         if (tt)
@@ -4065,7 +4063,7 @@ void HtmlGenerator::generateStatus(const Node *node, CodeMarker *marker)
     switch (node->status()) {
     case Node::Obsolete:
         if (node->isInnerNode())
-	    Generator::generateStatus(node, marker);
+            Generator::generateStatus(node, marker);
         break;
     case Node::Compat:
         if (node->isInnerNode()) {
@@ -4225,7 +4223,7 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
                     out() << "<tr class=\"odd\">";
                 else
                     out() << "<tr class=\"even\">";
-				
+
                 out() << "<td class=\"tblQmlPropNode\"><p>";
 
                 out() << "<a name=\"" + refForNode(qpn) + "\"></a>";
@@ -4265,10 +4263,10 @@ void HtmlGenerator::generateDetailedQmlMember(const Node *node,
         out() << "<div class=\"qmlproto\">";
         out() << "<table class=\"qmlname\">";
         //out() << "<tr>";
-		if (++numTableRows % 2 == 1)
-			out() << "<tr class=\"odd\">";
-		else
-			out() << "<tr class=\"even\">";
+        if (++numTableRows % 2 == 1)
+            out() << "<tr class=\"odd\">";
+        else
+            out() << "<tr class=\"even\">";
         out() << "<td class=\"tblQmlFuncNode\"><p>";
         out() << "<a name=\"" + refForNode(qmn) + "\"></a>";
         generateSynopsis(qmn,relative,marker,CodeMarker::Detailed,false);
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp
index a187c2e..37dc191 100644
--- a/tools/qdoc3/pagegenerator.cpp
+++ b/tools/qdoc3/pagegenerator.cpp
@@ -310,10 +310,10 @@ PageGenerator::generateInnerNode(const InnerNode* node, CodeMarker* marker)
         const FakeNode *fakeNode = static_cast<const FakeNode *>(node);
         if (fakeNode->subType() == Node::ExternalPage)
             return;
-#ifdef QDOC_QML            
+        if (fakeNode->subType() == Node::Image)
+            return;
         if (fakeNode->subType() == Node::QmlPropertyGroup)
             return;
-#endif            
         if (fakeNode->subType() == Node::Page) {
             if (node->count() > 0)
                 qDebug("PAGE %s HAS CHILDREN", qPrintable(fakeNode->title()));
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 9675f99..4fe2868 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE
 // external use ignore them
 // extern bool Q_CORE_EXPORT qt_resolve_symlinks;
 
-static const char *appearance_text =
+static const char *appearance_text = QT_TRANSLATE_NOOP("MainWindow",
 "<p><b><font size+=2>Appearance</font></b></p>"
 "<hr>"
 "<p>Use this tab to customize the appearance of your Qt applications.</p>"
@@ -95,9 +95,9 @@ static const char *appearance_text =
 "To customize colors further, press the Tune Palette button to open "
 "the advanced palette editor."
 "<p>The Preview Window shows what the selected Style and colors look "
-"like.";
+"like.");
 
-static const char *font_text =
+static const char *font_text = QT_TRANSLATE_NOOP("MainWindow",
 "<p><b><font size+=2>Fonts</font></b></p>"
 "<hr>"
 "<p>Use this tab to select the default font for your Qt applications. "
@@ -114,9 +114,9 @@ static const char *font_text =
 "Korean characters that are not found in the Lucida font will be taken "
 "from the Mincho font.  Because the font substitutions are "
 "lists, you can also select multiple families, such as Song Ti (for "
-"use with Chinese text).";
+"use with Chinese text).");
 
-static const char *interface_text =
+static const char *interface_text = QT_TRANSLATE_NOOP("MainWindow",
 "<p><b><font size+=2>Interface</font></b></p>"
 "<hr>"
 "<p>Use this tab to customize the feel of your Qt applications.</p>"
@@ -131,10 +131,10 @@ static const char *interface_text =
 "at 0 will disable the Global Strut feature</p>"
 "<p>XIM (Extended Input Methods) are used for entering characters in "
 "languages that have large character sets, for example, Chinese and "
-"Japanese.";
+"Japanese.");
 // ### What does the 'Enhanced support for languages written R2L do?
 
-static const char *printer_text =
+static const char *printer_text = QT_TRANSLATE_NOOP("MainWindow",
 "<p><b><font size+=2>Printer</font></b></p>"
 "<hr>"
 "<p>Use this tab to configure the way Qt generates output for the printer."
@@ -145,14 +145,14 @@ static const char *printer_text =
 "size will be bigger."
 "<p>When using font embedding you can select additional directories where "
 "Qt should search for embeddable font files.  By default, the X "
-"server font path is used.";
+"server font path is used.");
 
-static const char *phonon_text =
+static const char *phonon_text = QT_TRANSLATE_NOOP("MainWindow",
 "<p><b><font size+=2>Phonon</font></b></p>"
 "<hr>"
 "<p>Use this tab to configure the Phonon GStreamer multimedia backend. "
 "<p>It is reccommended to leave all settings on \"Auto\" to let "
-"Phonon determine your settings automatically.";
+"Phonon determine your settings automatically.");
 
 static QColorGroup::ColorRole centralFromItem( int item )
 {