Merge commit 'qt-mainline/4.6' into kinetic-declarativeui

Conflicts:
	configure.exe

34 files changed, 316 insertions, 220 deletions

diff --git a/tools/assistant/compat/translations/translations.pro b/tools/assistant/compat/translations/translations.pro
deleted file mode 100644
index 19fcc06..0000000
--- a/tools/assistant/compat/translations/translations.pro
+++ /dev/null
@@ -1,34 +0,0 @@
-# Include those manually as they do not contain any directory specification
-
-FORMS += ../helpdialog.ui \
-         ../mainwindow.ui \
-         ../tabbedbrowser.ui \
-         ../topicchooser.ui
-
-SOURCES += ../main.cpp \
-           ../helpwindow.cpp \
-           ../topicchooser.cpp \
-           ../docuparser.cpp \
-           ../index.cpp \
-           ../profile.cpp \
-           ../config.cpp \
-           ../helpdialog.cpp \
-           ../mainwindow.cpp \
-           ../tabbedbrowser.cpp \
-           ../fontsettingsdialog.cpp
-
-SOURCES += ../../../shared/fontpanel/fontpanel.cpp
-
-HEADERS += ../helpwindow.h \
-           ../topicchooser.h \
-           ../docuparser.h \
-           ../index.h \
-           ../profile.h \
-           ../helpdialog.h \
-           ../mainwindow.h \
-           ../tabbedbrowser.h \
-           ../config.h \
-           ../fontsettingsdialog.h
-
-
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts
diff --git a/tools/assistant/translations/qt_help.pro b/tools/assistant/translations/qt_help.pro
index 9f4d7d8..69570d3 100644
--- a/tools/assistant/translations/qt_help.pro
+++ b/tools/assistant/translations/qt_help.pro
@@ -39,12 +39,14 @@ HEADERS += ../lib/qhelpcollectionhandler_p.h \
            ../lib/qhelp_global.h
 
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qt_help_de.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_ja.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_untranslated.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_zh_TW.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qt_help_da.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/qt_help_da.ts \
+    $$TR_DIR/qt_help_de.ts
+    $$TR_DIR/qt_help_ja.ts \
+    $$TR_DIR/qt_help_pl.ts \
+    $$TR_DIR/qt_help_ru.ts \
+    $$TR_DIR/qt_help_zh_CN.ts \
+    $$TR_DIR/qt_help_zh_TW.ts
+
 error("This is a dummy profile to be used for translations ONLY.")
diff --git a/tools/assistant/translations/translations.pro b/tools/assistant/translations/translations.pro
index 4b836e6..6ff1fc9 100644
--- a/tools/assistant/translations/translations.pro
+++ b/tools/assistant/translations/translations.pro
@@ -40,11 +40,12 @@ HEADERS += ../tools/assistant/aboutdialog.h \
            ../tools/assistant/searchwidget.h \
            ../tools/assistant/topicchooser.h \
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_de.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_ja.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_untranslated.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_zh_TW.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_da.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/assistant_da.ts \
+    $$TR_DIR/assistant_de.ts \
+    $$TR_DIR/assistant_ja.ts \
+    $$TR_DIR/assistant_pl.ts \
+    $$TR_DIR/assistant_ru.ts \
+    $$TR_DIR/assistant_zh_CN.ts \
+    $$TR_DIR/assistant_zh_TW.ts
diff --git a/tools/assistant/translations/translations_adp.pro b/tools/assistant/translations/translations_adp.pro
index c6f3e81..852bdeb 100644
--- a/tools/assistant/translations/translations_adp.pro
+++ b/tools/assistant/translations/translations_adp.pro
@@ -31,11 +31,13 @@ HEADERS += ../compat/helpwindow.h \
            ../compat/fontsettingsdialog.h
 
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/assistant_adp_de.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ja.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_untranslated.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/assistant_adp_zh_TW.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/assistant_adp_de.ts \
+    $$TR_DIR/assistant_adp_ja.ts \
+    $$TR_DIR/assistant_adp_pl.ts \
+    $$TR_DIR/assistant_adp_ru.ts \
+    $$TR_DIR/assistant_adp_zh_CN.ts \
+    $$TR_DIR/assistant_adp_zh_TW.ts
+
 error("This is a dummy profile to be used for translations ONLY.")
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index afb2dec..4d1a025 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2032,9 +2032,9 @@ bool Configure::checkAvailability(const QString &part)
             if (!findFile("msdmo.lib")) cout << "msdmo.lib not found" << endl;
             if (!findFile("d3d9.h")) cout << "d3d9.h not found" << endl;
         }
-    } else if (part == "MULTIMEDIA") {
+    } else if (part == "MULTIMEDIA" || part == "SCRIPT" || part == "SCRIPTTOOLS") {
         available = true;
-    } else if (part == "WEBKIT" || part == "SCRIPT" || part == "SCRIPTTOOLS") {
+    } else if (part == "WEBKIT") {
         available = (dictionary.value("QMAKESPEC") == "win32-msvc2005") || (dictionary.value("QMAKESPEC") == "win32-msvc2008") || (dictionary.value("QMAKESPEC") == "win32-g++");
     }
 
diff --git a/tools/designer/translations/translations.pro b/tools/designer/translations/translations.pro
index c8cd76d..a37918c 100644
--- a/tools/designer/translations/translations.pro
+++ b/tools/designer/translations/translations.pro
@@ -130,10 +130,12 @@ HEADERS += ../../shared/findwidget/abstractfindwidget.h \
            ../../shared/findwidget/itemviewfindwidget.h \
            ../../shared/findwidget/texteditfindwidget.h
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/designer_de.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_ja.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_zh_TW.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/designer_untranslated.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/designer_de.ts \
+    $$TR_DIR/designer_ja.ts \
+    $$TR_DIR/designer_pl.ts \
+    $$TR_DIR/designer_ru.ts \
+    $$TR_DIR/designer_sl.ts \
+    $$TR_DIR/designer_zh_CN.ts \
+    $$TR_DIR/designer_zh_TW.ts
diff --git a/tools/linguist/lconvert/main.cpp b/tools/linguist/lconvert/main.cpp
index 67553a0..6f5f86a 100644
--- a/tools/linguist/lconvert/main.cpp
+++ b/tools/linguist/lconvert/main.cpp
@@ -234,10 +234,6 @@ int main(int argc, char *argv[])
         return usage(args);
 
     tr.setLanguageCode(Translator::guessLanguageCodeFromFileName(inFiles[0].name));
-    if (!targetLanguage.isEmpty())
-        tr.setLanguageCode(targetLanguage);
-    if (!sourceLanguage.isEmpty())
-        tr.setSourceLanguageCode(sourceLanguage);
 
     if (!tr.load(inFiles[0].name, cd, inFiles[0].format)) {
         qWarning() << qPrintable(cd.error());
@@ -256,6 +252,10 @@ int main(int argc, char *argv[])
             tr.replaceSorted(tr2.message(j));
     }
 
+    if (!targetLanguage.isEmpty())
+        tr.setLanguageCode(targetLanguage);
+    if (!sourceLanguage.isEmpty())
+        tr.setSourceLanguageCode(sourceLanguage);
     if (noObsolete)
         tr.stripObsoleteMessages();
     if (noFinished)
diff --git a/tools/linguist/linguist/linguist.pro b/tools/linguist/linguist/linguist.pro
index 00ebec1..c902aeb 100644
--- a/tools/linguist/linguist/linguist.pro
+++ b/tools/linguist/linguist/linguist.pro
@@ -95,11 +95,12 @@ FORMS += statistics.ui \
     finddialog.ui
 RESOURCES += linguist.qrc
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/linguist_ja.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_untranslated.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_zh_TW.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_de.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/linguist_fr.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/linguist_de.ts \
+    $$TR_DIR/linguist_fr.ts \
+    $$TR_DIR/linguist_ja.ts \
+    $$TR_DIR/linguist_pl.ts \
+    $$TR_DIR/linguist_ru.ts \
+    $$TR_DIR/linguist_zh_CN.ts \
+    $$TR_DIR/linguist_zh_TW.ts
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index ed41edb..7a616e3 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -1031,6 +1031,10 @@ QStringList CppParser::stringListifySegments(const QList<HashString> &segments)
 }
 
 struct QualifyOneData {
+    QualifyOneData(const NamespaceList &ns, int nsc, const HashString &seg, NamespaceList *rslvd)
+        : namespaces(ns), nsCount(nsc), segment(seg), resolved(rslvd)
+    {}
+
     const NamespaceList &namespaces;
     int nsCount;
     const HashString &segment;
@@ -1069,7 +1073,7 @@ bool CppParser::qualifyOneCallbackUsing(const Namespace *ns, void *context) cons
 bool CppParser::qualifyOne(const NamespaceList &namespaces, int nsCnt, const HashString &segment,
                            NamespaceList *resolved) const
 {
-    QualifyOneData data = { namespaces, nsCnt, segment, resolved, QSet<HashStringList>() };
+    QualifyOneData data(namespaces, nsCnt, segment, resolved);
 
     if (visitNamespace(namespaces, nsCnt, &CppParser::qualifyOneCallbackOwn, &data))
         return true;
diff --git a/tools/linguist/lupdate/main.cpp b/tools/linguist/lupdate/main.cpp
index 24da253..d570e02 100644
--- a/tools/linguist/lupdate/main.cpp
+++ b/tools/linguist/lupdate/main.cpp
@@ -114,12 +114,11 @@ static void printUsage()
         "           Name of a .pro file. Useful for files with .pro\n"
         "           file syntax but different file suffix\n"
         "    -source-language <language>[_<region>]\n"
-        "           Specify/override the language of the source strings. Defaults to\n"
-        "           POSIX if not specified and the file does not name it yet.\n"
+        "           Specify the language of the source strings for new files.\n"
+        "           Defaults to POSIX if not specified.\n"
         "    -target-language <language>[_<region>]\n"
-        "           Specify/override the language of the translation.\n"
-        "           The target language is guessed from the file name if this option\n"
-        "           is not specified and the file contents name no language yet.\n"
+        "           Specify the language of the translations for new files.\n"
+        "           Guessed from the file name if not specified.\n"
         "    -version\n"
         "           Display the version of lupdate and exit.\n"
     ).arg(m_defaultExtensions));
diff --git a/tools/linguist/shared/xliff.cpp b/tools/linguist/shared/xliff.cpp
index d81f3e8..989279f 100644
--- a/tools/linguist/shared/xliff.cpp
+++ b/tools/linguist/shared/xliff.cpp
@@ -500,7 +500,9 @@ bool XLIFFHandler::startElement(const QString& namespaceURI,
     } else if (localName == QLatin1String("file")) {
         m_fileName = atts.value(QLatin1String("original"));
         m_language = atts.value(QLatin1String("target-language"));
+        m_language.replace(QLatin1Char('-'), QLatin1Char('_'));
         m_sourceLanguage = atts.value(QLatin1String("source-language"));
+        m_sourceLanguage.replace(QLatin1Char('-'), QLatin1Char('_'));
     } else if (localName == QLatin1String("group")) {
         if (atts.value(QLatin1String("restype")) == QLatin1String(restypeContext)) {
             m_context = atts.value(QLatin1String("resname"));
@@ -773,14 +775,19 @@ bool saveXLIFF(const Translator &translator, QIODevice &dev, ConversionData &cd)
        << "\" xmlns:trolltech=\"" << TrollTsNamespaceURI << "\">\n";
     ++indent;
     writeExtras(ts, indent, translator.extras(), drops);
+    QString sourceLanguageCode = translator.sourceLanguageCode();
+    if (sourceLanguageCode.isEmpty() || sourceLanguageCode == QLatin1String("C"))
+        sourceLanguageCode = QLatin1String("en");
+    else
+        sourceLanguageCode.replace(QLatin1Char('_'), QLatin1Char('-'));
+    QString languageCode = translator.languageCode();
+    languageCode.replace(QLatin1Char('_'), QLatin1Char('-'));
     foreach (const QString &fn, fileOrder) {
         writeIndent(ts, indent);
         ts << "<file original=\"" << fn << "\""
             << " datatype=\"" << dataType(messageOrder[fn].begin()->first()) << "\""
-            << " source-language=\""
-                << (translator.sourceLanguageCode().isEmpty() ?
-                    QByteArray("en") : translator.sourceLanguageCode().toLatin1()) << "\""
-            << " target-language=\"" << translator.languageCode() << "\""
+            << " source-language=\"" << sourceLanguageCode.toLatin1() << "\""
+            << " target-language=\"" << languageCode.toLatin1() << "\""
             << "><body>\n";
         ++indent;
 
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index 4b5f0c6..ec5ce96 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -47,6 +47,7 @@
 #include <qfile.h>
 
 #include <stdio.h>
+#include <errno.h>
 
 #include "codechunk.h"
 #include "config.h"
@@ -281,7 +282,7 @@ void CppCodeParser::parseSourceFile(const Location& location,
 {
     FILE *in = fopen(QFile::encodeName(filePath), "r");
     if (!in) {
-        location.error(tr("Cannot open C++ source file '%1'").arg(filePath));
+        location.error(tr("Cannot open C++ source file '%1' (%2)").arg(filePath).arg(strerror(errno)));
         return;
     }
 
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index c202d71..748390f 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -2641,56 +2641,63 @@ Text Doc::trimmedBriefText(const QString &className) const
         bool standardWording = true;
 
         /*
-            This code is really ugly. The entire \brief business
-            should be rethought.
+          This code is really ugly. The entire \brief business
+          should be rethought.
         */
-        while (atom && (atom->type() == Atom::AutoLink || atom->type() == Atom::String)) {
-            briefStr += atom->string();
+        while (atom) {
+            if (atom->type() == Atom::AutoLink || atom->type() == Atom::String) {
+                briefStr += atom->string();
+            }
             atom = atom->next();
         }
 
         QStringList w = briefStr.split(" ");
-        if (!w.isEmpty() && w.first() == "The")
-	    w.removeFirst();
-        else {
-	    location().warning(
-                tr("Nonstandard wording in '\\%1' text for '%2' (expected 'The')")
-                .arg(COMMAND_BRIEF).arg(className));
-	    standardWording = false;
+        if (!w.isEmpty() && w.first() == "Returns") {
         }
-
-        if (!w.isEmpty() && (w.first() == className || w.first() == classNameOnly))
-	    w.removeFirst();
         else {
-	    location().warning(
-                tr("Nonstandard wording in '\\%1' text for '%2' (expected '%3')")
-                .arg(COMMAND_BRIEF).arg(className).arg(className));
-	    standardWording = false;
-        }
+            if (!w.isEmpty() && w.first() == "The")
+                w.removeFirst();
+            else {
+                location().warning(
+                  tr("Nonstandard wording in '\\%1' text for '%2' (expected 'The')")
+                  .arg(COMMAND_BRIEF).arg(className));
+                standardWording = false;
+            }
 
-        if (!w.isEmpty() && ((w.first() == "class") ||
-                             (w.first() == "function") ||
-                             (w.first() == "macro") ||
-                             (w.first() == "widget") ||
-                             (w.first() == "namespace") ||
-                             (w.first() == "header")))
-	    w.removeFirst();
-        else {
-	    location().warning(
-                tr("Nonstandard wording in '\\%1' text for '%2' ("
-                   "expected 'class', 'function', 'macro', 'widget', "
-                   "'namespace' or 'header')")
-                .arg(COMMAND_BRIEF).arg(className));
-	    standardWording = false;
-        }
+            if (!w.isEmpty() && (w.first() == className || w.first() == classNameOnly))
+                w.removeFirst();
+            else {
+                location().warning(
+                  tr("Nonstandard wording in '\\%1' text for '%2' (expected '%3')")
+                  .arg(COMMAND_BRIEF).arg(className).arg(className));
+                standardWording = false;
+            }
 
-        if (!w.isEmpty() && (w.first() == "is" || w.first() == "provides"))
-	    w.removeFirst();
+            if (!w.isEmpty() && ((w.first() == "class") ||
+                                 (w.first() == "function") ||
+                                 (w.first() == "macro") ||
+                                 (w.first() == "widget") ||
+                                 (w.first() == "namespace") ||
+                                 (w.first() == "header")))
+                w.removeFirst();
+            else {
+                location().warning(
+                  tr("Nonstandard wording in '\\%1' text for '%2' ("
+                     "expected 'class', 'function', 'macro', 'widget', "
+                     "'namespace' or 'header')")
+                  .arg(COMMAND_BRIEF).arg(className));
+                standardWording = false;
+            }
 
-        if (!w.isEmpty() && (w.first() == "a" || w.first() == "an"))
-	    w.removeFirst();
+            if (!w.isEmpty() && (w.first() == "is" || w.first() == "provides"))
+                w.removeFirst();
+
+            if (!w.isEmpty() && (w.first() == "a" || w.first() == "an"))
+                w.removeFirst();
+        }
 
         whats = w.join(" ");
+        
         if (whats.endsWith("."))
 	    whats.truncate(whats.length() - 1);
 
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index 47fe4b5..f7569ce 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -562,27 +562,20 @@ void Generator::generateModuleWarning(const ClassNode *classe,
     QString module = classe->moduleName();
     if (!module.isEmpty()) {
         Text text;
-        if (!editionModuleMap["Console"].contains(module)) {
+        if (!editionModuleMap["DesktopLight"].contains(module)) {
             text << Atom::ParaLeft
                  << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD)
-                 << "This class is not part of the Qt Console Edition."
-                 << Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD)
-                 << Atom::ParaRight;
-        }
-        else if (!editionModuleMap["DesktopLight"].contains(module)) {
-            text << Atom::ParaLeft
-                 << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD)
-                 << "This class is not part of the Qt Desktop Light Edition."
+                 << "This class is not part of the Qt GUI Framework Edition."
                  << Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD)
                  << Atom::ParaRight;
         }
         else if (module == "Qt3Support") {
             text << Atom::ParaLeft
                  << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD)
-                 << "Note to Qt Desktop Light Edition users:"
+                 << "Note to Qt GUI Framework Edition users:"
                  << Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD)
                  << " This class is only available in the "
-                 << Atom(Atom::AutoLink, "Qt Desktop Edition")
+                 << Atom(Atom::AutoLink, "Qt Full Framework Edition")
                  << "." << Atom::ParaRight;
         }
 
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 5406017..291f60b 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -330,7 +330,65 @@ void HtmlGenerator::generateTree(const Tree *tree, CodeMarker *marker)
 #ifdef ZZZ_QDOC_QML
     findAllQmlClasses(tree->root());
 #endif
-    findAllSince(tree->root(),tree->version());
+    findAllSince(tree->root());
+
+#if 0    
+    if (!sinceVersions.isEmpty()) {
+        SinceVersionMap::const_iterator v = sinceVersions.constEnd();
+        do {
+            --v;
+            qDebug() << "SINCE:" << v.key();
+            if (!v.value().isEmpty()) {
+                QString type;
+                SinceNodeMultiMap::const_iterator n = v.value().constBegin();
+                while (n != v.value().constEnd()) {
+                    switch (n.value()->type()) {
+                        case Node::Namespace:
+                            type = "namespace";
+                            break;
+                        case Node::Class:
+                            type = "class";
+                            break;
+                        case Node::Fake:
+                            type = "fake";
+                            break;
+                        case Node::Enum: 
+                            type = "enum";
+                            break;
+                        case Node::Typedef:
+                            type = "typedef";
+                            break;
+                        case Node::Function:
+                            type = "function";
+                            break;
+                        case Node::Property:
+                            type = "property";
+                            break;
+                        case Node::Variable:
+                            type = "variable";
+                            break;
+                        case Node::Target:
+                            type = "target";
+                            break;
+                        case Node::QmlProperty:
+                            type = "QML property";
+                            break;
+                        case Node::QmlSignal:
+                            type = "QML signal";
+                            break;
+                        case Node::QmlMethod:
+                            type = "QML method";
+                            break;
+                        default:
+                            type = "No type";
+                    }
+                    qDebug() << "    " << type << n.key();
+                    ++n;
+                }
+            }
+        } while (v != sinceVersions.constBegin());
+    }
+#endif
 
     PageGenerator::generateTree(tree, marker);
 
@@ -655,20 +713,30 @@ int HtmlGenerator::generateAtom(const Atom *atom,
         break;
     case Atom::SinceList:
         {
-            QList<Node*> values;
-            if (atom->string() == "classes") {
-                values = sinceClasses.values();
-            }
-            else if (atom->string() == "functions") {
-                values = sinceFunctions.values();
-            }
-            if (!values.isEmpty()) {
-                QMap<QString, const Node*> nodeMap;
-                for (int i=0; i<values.size(); ++i) {
-                    const Node* n = values.at(i);
-                    nodeMap.insert(n->nameForLists(),n);
+            QList<Node*> nodes;
+            SinceVersionMap::const_iterator v;
+            v = sinceVersions.find(atom->string());
+            if ((v != sinceVersions.constEnd()) && !v.value().isEmpty()) {
+                for (int i=0; !Node::typeName(i).isEmpty(); i++) {
+                    Node::Type t = (Node::Type) i;
+                    SinceNodeMultiMap::const_iterator n=v.value().constBegin();
+                    QMultiMap<QString, const Node*> nodeMap;
+                    while (n != v.value().constEnd()) {
+                        const Node* node = n.value();
+                        if (node->type() == t)
+                            nodeMap.insert(node->nameForLists(),node);
+                        ++n;
+                    }
+                    if (!nodeMap.isEmpty()) {
+                        out() << "<h2>"
+                              << Node::typeName(i)
+                              << " new in Qt "
+                              << atom->string()
+                              << "</h2>";
+                        generateAnnotatedList(relative, marker, nodeMap);
+                        nodeMap.clear();
+                    }
                 }
-                generateAnnotatedList(relative, marker, nodeMap);
             }
         }
         break;
@@ -3517,22 +3585,21 @@ void HtmlGenerator::findAllClasses(const InnerNode *node)
 /*!
   For generating the "Since x.y" page.
  */
-void HtmlGenerator::findAllSince(const InnerNode *node, QString version)
+void HtmlGenerator::findAllSince(const InnerNode *node)
 {
-    const QRegExp versionSeparator("[\\-\\.]");
-    const int minorIndex = version.indexOf(versionSeparator);
-    const int patchIndex = version.indexOf(versionSeparator, minorIndex+1);
-    version = version.left(patchIndex);
-
     NodeList::const_iterator c = node->childNodes().constBegin();
     while (c != node->childNodes().constEnd()) {
-        if (((*c)->access() != Node::Private) && ((*c)->since() == version)) {
+        QString sinceVersion = (*c)->since();
+        if (((*c)->access() != Node::Private) && !sinceVersion.isEmpty()) {
+            SinceVersionMap::iterator vmap = sinceVersions.find(sinceVersion);
+            if (vmap == sinceVersions.end())
+                vmap = sinceVersions.insert(sinceVersion,SinceNodeMultiMap());
             if ((*c)->type() == Node::Function) {
                 FunctionNode *func = static_cast<FunctionNode *>(*c);
                 if ((func->status() > Node::Obsolete) &&
                     (func->metaness() != FunctionNode::Ctor) &&
                     (func->metaness() != FunctionNode::Dtor)) {
-                    sinceFunctions.insert(func->name(), func);
+                    vmap.value().insert(func->name(),(*c));
                 }
             }
             else if ((*c)->url().isEmpty()) {
@@ -3542,17 +3609,33 @@ void HtmlGenerator::findAllSince(const InnerNode *node, QString version)
                         (*c)->parent()->type() == Node::Namespace &&
                         !(*c)->parent()->name().isEmpty())
                         className = (*c)->parent()->name()+"::"+className;
-                    sinceClasses.insert(className, *c);
+                    vmap.value().insert(className,(*c));
                 }
             }
+            else {
+                QString name = (*c)->name();
+                if ((*c)->parent() &&
+                    (*c)->parent()->type() == Node::Namespace &&
+                    !(*c)->parent()->name().isEmpty())
+                    name = (*c)->parent()->name()+"::"+name;
+                vmap.value().insert(name,(*c));
+                qDebug() << "GOT HEAH" << name;
+            }
             if ((*c)->isInnerNode()) {
-                findAllSince(static_cast<InnerNode *>(*c),version);
+                findAllSince(static_cast<InnerNode *>(*c));
             }
         }
         ++c;
     }
 }
 
+#if 0
+    const QRegExp versionSeparator("[\\-\\.]");
+    const int minorIndex = version.indexOf(versionSeparator);
+    const int patchIndex = version.indexOf(versionSeparator, minorIndex+1);
+    version = version.left(patchIndex);
+#endif
+
 void HtmlGenerator::findAllFunctions(const InnerNode *node)
 {
     NodeList::ConstIterator c = node->childNodes().begin();
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index 24e2986..3f6e564 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -67,6 +67,9 @@ struct NavigationBar
 };
 #endif
 
+typedef QMultiMap<QString, Node*> SinceNodeMultiMap;
+typedef QMap<QString, SinceNodeMultiMap> SinceVersionMap;
+
 class HelpProjectWriter;
 
 class HtmlGenerator : public PageGenerator
@@ -216,7 +219,7 @@ class HtmlGenerator : public PageGenerator
 #ifdef ZZZ_QDOC_QML    
     void findAllQmlClasses(const InnerNode *node);
 #endif
-    void findAllSince(const InnerNode *node, QString version);
+    void findAllSince(const InnerNode *node);
     static int hOffset(const Node *node);
     static bool isThreeColumnEnumValueTable(const Atom *atom);
     virtual QString getLink(const Atom *atom, 
@@ -286,8 +289,7 @@ class HtmlGenerator : public PageGenerator
 #endif
     QMap<QString, QMap<QString, const Node *> > funcIndex;
     QMap<Text, const Node *> legaleseTexts;
-    QMap<QString, Node*> sinceClasses;
-    QMap<QString, Node*> sinceFunctions;
+    SinceVersionMap sinceVersions;
 };
 
 #define HTMLGENERATOR_ADDRESS           "address"
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index b44ede0..d547d20 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -48,6 +48,23 @@
 
 QT_BEGIN_NAMESPACE
 
+QString Node::typeNames[] =
+    {
+        "Namespaces", 
+        "Classes", 
+        "Fake", 
+        "Enums", 
+        "Typedefs", 
+        "Functions and Macros", 
+        "Properties",
+        "Variables", 
+        "Targets",
+        "Qml Properties",
+        "Qml Signals",
+        "Qml Methods",
+        ""
+    };
+
 /*!
   \class Node
   \brief A node in a Tree.
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index fdef920..09f38d2 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -76,9 +76,11 @@ class Node
         Target,
         QmlProperty,
         QmlSignal,
-        QmlMethod
+        QmlMethod,
+        LastType
 #else
-        Target 
+        Target,
+        LastType
 #endif
     };
 
@@ -173,10 +175,13 @@ class Node
 
     virtual QString fileBase() const;
 
+    static QString typeName(int i) { return typeNames[i]; }
+
  protected:
     Node(Type type, InnerNode *parent, const QString& name);
 
  private:
+    static QString typeNames[];
 #ifdef Q_WS_WIN
     Type typ;
     Access acc;
diff --git a/tools/qdoc3/test/assistant.qdocconf b/tools/qdoc3/test/assistant.qdocconf
index 9ee8965..4ddc94a 100644
--- a/tools/qdoc3/test/assistant.qdocconf
+++ b/tools/qdoc3/test/assistant.qdocconf
@@ -31,7 +31,7 @@ qhp.Assistant.subprojects.examples.sortPages = true
 
 language                = Cpp
 
-sources                 = $QT_SOURCE_TREE/doc/src/assistant-manual.qdoc \
+sources                 = $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \
                           $QT_SOURCE_TREE/doc/src/examples/simpletextviewer.qdoc
 
 sources.fileextensions  = "*.cpp *.qdoc"
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css
index c0bc3d47..320da66 100644
--- a/tools/qdoc3/test/classic.css
+++ b/tools/qdoc3/test/classic.css
@@ -43,10 +43,11 @@ table.valuelist {
 
 table.indextable {
 	border-width: 1px 1px 1px 1px;
+	border-style: solid;
 	border-collapse: collapse;
 	background-color: #f0f0f0;
     border-color:#555;
-    font-size: 110%;
+    font-size: 100%;
 }
 
 table td.largeindex {
@@ -68,14 +69,17 @@ table.valuelist th {
 
 th.titleheader  {
 	border-width: 1px 0px 1px 0px;
-	padding: 4px;
+	padding: 2px;
 	border-style: solid;
-	border-color: #444;
+	border-color: #666;
     color:white;
-    background-color:#555555;
-    font-size: 110%;
+    background-color:#555;
+    background-image:url('images/gradient.png')};
+    background-repeat: repeat-x;
+    font-size: 100%;
 }
 
+
 th.largeheader {
 	border-width: 1px 0px 1px 0px;
 	padding: 4px;
diff --git a/tools/qdoc3/test/designer.qdocconf b/tools/qdoc3/test/designer.qdocconf
index 2a65184..9d8bd23 100644
--- a/tools/qdoc3/test/designer.qdocconf
+++ b/tools/qdoc3/test/designer.qdocconf
@@ -31,7 +31,7 @@ qhp.Designer.subprojects.examples.sortPages = true
 
 language                = Cpp
 
-sources                 = $QT_SOURCE_TREE/doc/src/designer-manual.qdoc \
+sources                 = $QT_SOURCE_TREE/doc/src/development/designer-manual.qdoc \
                           $QT_SOURCE_TREE/doc/src/examples/calculatorbuilder.qdoc \
                           $QT_SOURCE_TREE/doc/src/examples/calculatorform.qdoc \
                           $QT_SOURCE_TREE/doc/src/examples/customwidgetplugin.qdoc \
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index 6c71993..f433529 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -31,7 +31,7 @@ qhp.Linguist.subprojects.examples.sortPages = true
 
 language                = Cpp
 
-sources                 = $QT_SOURCE_TREE/doc/src/linguist-manual.qdoc \
+sources                 = $QT_SOURCE_TREE/doc/src/internationalization/linguist-manual.qdoc \
                           $QT_SOURCE_TREE/doc/src/examples/hellotr.qdoc \
                           $QT_SOURCE_TREE/doc/src/examples/arrowpad.qdoc \
                           $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf
index 3dc1d3b..dcb3c9a 100644
--- a/tools/qdoc3/test/qmake.qdocconf
+++ b/tools/qdoc3/test/qmake.qdocconf
@@ -27,7 +27,7 @@ qhp.qmake.subprojects.manual.selectors = fake:page
 
 language                = Cpp
 
-sources                 = $QT_SOURCE_TREE/doc/src/qmake-manual.qdoc
+sources                 = $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc
 
 sources.fileextensions  = "*.cpp *.qdoc"
 
diff --git a/tools/qdoc3/test/qt-api-only-with-xcode.qdocconf b/tools/qdoc3/test/qt-api-only-with-xcode.qdocconf
index 0389386..0d78cda 100644
--- a/tools/qdoc3/test/qt-api-only-with-xcode.qdocconf
+++ b/tools/qdoc3/test/qt-api-only-with-xcode.qdocconf
@@ -9,9 +9,9 @@ url                     = ./
 # Ensures that the documentation for the tools is not included in the generated
 # .qhp file.
 
-qhp.Qt.excluded   = $QT_SOURCE_TREE/doc/src/assistant-manual.qdoc \
+qhp.Qt.excluded   = $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/simpletextviewer.qdoc \
-                    $QT_SOURCE_TREE/doc/src/designer-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/development/designer-manual.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/calculatorbuilder.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/calculatorform.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/customwidgetplugin.qdoc \
@@ -19,11 +19,11 @@ qhp.Qt.excluded   = $QT_SOURCE_TREE/doc/src/assistant-manual.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/containerextension.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/worldtimeclockbuilder.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/worldtimeclockplugin.qdoc \
-                    $QT_SOURCE_TREE/doc/src/linguist-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/internationalization/linguist-manual.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/hellotr.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/arrowpad.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc \
-                    $QT_SOURCE_TREE/doc/src/qmake-manual.qdoc
+                    $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc
 
 outputdir         = $QT_BUILD_TREE/doc-build/html-qt
 base              = file:$QT_BUILD_TREE/doc-build/html-qt
diff --git a/tools/qdoc3/test/qt-api-only.qdocconf b/tools/qdoc3/test/qt-api-only.qdocconf
index bc5656b..10b7be5 100644
--- a/tools/qdoc3/test/qt-api-only.qdocconf
+++ b/tools/qdoc3/test/qt-api-only.qdocconf
@@ -9,9 +9,9 @@ url                     = ./
 # Ensures that the documentation for the tools is not included in the generated
 # .qhp file.
 
-qhp.Qt.excluded  += $QT_SOURCE_TREE/doc/src/assistant-manual.qdoc \
+qhp.Qt.excluded  += $QT_SOURCE_TREE/doc/src/development/assistant-manual.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/simpletextviewer.qdoc \
-                    $QT_SOURCE_TREE/doc/src/designer-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/development/designer-manual.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/calculatorbuilder.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/calculatorform.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/customwidgetplugin.qdoc \
@@ -19,11 +19,11 @@ qhp.Qt.excluded  += $QT_SOURCE_TREE/doc/src/assistant-manual.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/containerextension.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/worldtimeclockbuilder.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/worldtimeclockplugin.qdoc \
-                    $QT_SOURCE_TREE/doc/src/linguist-manual.qdoc \
+                    $QT_SOURCE_TREE/doc/src/internationalization/linguist-manual.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/hellotr.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/arrowpad.qdoc \
                     $QT_SOURCE_TREE/doc/src/examples/trollprint.qdoc \
-                    $QT_SOURCE_TREE/doc/src/qmake-manual.qdoc
+                    $QT_SOURCE_TREE/doc/src/development/qmake-manual.qdoc
 
 outputdir         = $QT_BUILD_TREE/doc-build/html-qt
 tagfile           = $QT_BUILD_TREE/doc-build/html-qt/qt.tags
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index c0b8334..0f1a776 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -8,8 +8,6 @@ project                 = Qt
 description             = Qt Reference Documentation
 url                     = http://qt.nokia.com/doc/4.6
 
-edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
-                          QtXmlPatterns QtTest
 edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtSql QtSvg \
                           QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
                           QtDesigner QtAssistant QAxContainer Phonon \
diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf
index 32f2af7..9621fcb 100644
--- a/tools/qdoc3/test/qt-inc.qdocconf
+++ b/tools/qdoc3/test/qt-inc.qdocconf
@@ -5,7 +5,6 @@ project                 = Qt
 description             = Qt Reference Documentation
 url                     = http://qt.nokia.com/doc/4.6
 
-edition.Console         = QtCore QtNetwork QtSql QtXml QtScript QtTest
 edition.Desktop         = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript \
                           QtDesigner QtAssistant Qt3Support QAxContainer \
                           QAxServer QtUiTools QtTest QtDBus
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 9b5937d..d019bdf 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -10,8 +10,6 @@ version                 = %VERSION%
 description             = Qt Reference Documentation
 url                     = http://qt.nokia.com/doc/4.6
 
-edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
-                          QtXmlPatterns QtTest
 edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg \
                           QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
                           QtDesigner QtAssistant QAxContainer Phonon \
@@ -97,6 +95,7 @@ excludedirs             = $QTDIR/src/3rdparty/clucene \
                           $QTDIR/src/3rdparty/phonon/gstreamer \
                           $QTDIR/src/3rdparty/phonon/ds9 \
                           $QTDIR/src/3rdparty/phonon/qt7 \
+                          $QTDIR/src/3rdparty/phonon/mmf \
                           $QTDIR/src/3rdparty/phonon/waveout
 
 sources.fileextensions  = "*.cpp *.qdoc *.mm"
diff --git a/tools/qtconfig/translations/translations.pro b/tools/qtconfig/translations/translations.pro
index 1f9f572..bf8a1da 100644
--- a/tools/qtconfig/translations/translations.pro
+++ b/tools/qtconfig/translations/translations.pro
@@ -7,8 +7,9 @@ HEADERS        += ../colorbutton.h ../previewframe.h ../previewwidget.h ../mainw
 
 FORMS        = ../mainwindowbase.ui ../paletteeditoradvancedbase.ui ../previewwidgetbase.ui
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qtconfig_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_untranslated.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qtconfig_zh_TW.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/qtconfig_pl.ts \
+    $$TR_DIR/qtconfig_ru.ts \
+    $$TR_DIR/qtconfig_zh_CN.ts \
+    $$TR_DIR/qtconfig_zh_TW.ts
diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp
index 879fb6b..6119419 100644
--- a/tools/qvfb/qvfb.cpp
+++ b/tools/qvfb/qvfb.cpp
@@ -41,6 +41,7 @@
 
 #include "qvfb.h"
 #include "qvfbview.h"
+#include "qvfbhdr.h"
 #ifdef Q_WS_X11
 #include "qvfbx11view.h"
 #endif
@@ -134,7 +135,7 @@ static const char *red_off_led_xpm[] = {
 
 static bool copyButtonConfiguration(const QString &prefix, int displayId)
 {
-    const QString destDir = QString(QLatin1String("/tmp/qtembedded-%1/")).arg(displayId);
+    const QString destDir = QT_VFB_DATADIR(displayId);
     const QFileInfo src(prefix + QLatin1String("defaultbuttons.conf"));
     const QFileInfo dst(destDir + QLatin1String("defaultbuttons.conf"));
     unlink(dst.absoluteFilePath().toLatin1().constData());
@@ -351,9 +352,9 @@ void QVFb::init( int display_id, int pw, int ph, int d, int r, const QString& sk
 	ph += 2;					// avoid scrollbar
 	scroller->show();
 	// delete defaultbuttons.conf if it was left behind...
-	unlink(QFileInfo(QString("/tmp/qtembedded-%1/defaultbuttons.conf").arg(view->displayId())).absoluteFilePath().toLatin1().constData());
+        unlink(QFileInfo(QT_VFB_DATADIR(view->displayId()).append("/defaultbuttons.conf")).absoluteFilePath().toLatin1().constData());
         if (secondaryView)
-            unlink(QFileInfo(QString("/tmp/qtembedded-%1/defaultbuttons.conf").arg(view->displayId()+1)).absoluteFilePath().toLatin1().constData());
+            unlink(QFileInfo(QT_VFB_DATADIR(view->displayId() + 1).append("/defaultbuttons.conf")).absoluteFilePath().toLatin1().constData());
     }
     view->setRate(refreshRate);
     if (secondaryView) {
diff --git a/tools/qvfb/qvfb.pro b/tools/qvfb/qvfb.pro
index 247337a..dde7e8d 100644
--- a/tools/qvfb/qvfb.pro
+++ b/tools/qvfb/qvfb.pro
@@ -9,6 +9,7 @@ target.path=$$[QT_INSTALL_BINS]
 INSTALLS += target
 
 DEPENDPATH      = ../../include
+INCLUDEPATH     += ../../src/gui/embedded
 
 FORMS           = config.ui
 HEADERS         = qvfb.h \
@@ -19,9 +20,9 @@ HEADERS         = qvfb.h \
                   qvfbprotocol.h \
                   qvfbshmem.h \
                   qvfbmmap.h \
-		  qvfbhdr.h \
-		  qlock_p.h \
-		  qwssignalhandler_p.h
+                  ../../src/gui/embedded/qvfbhdr.h \
+                  ../../src/gui/embedded/qlock_p.h \
+                  ../../src/gui/embedded/qwssignalhandler_p.h
 
 SOURCES         = qvfb.cpp \
 		  qvfbview.cpp \
@@ -31,8 +32,8 @@ SOURCES         = qvfb.cpp \
                   qvfbprotocol.cpp \
                   qvfbshmem.cpp \
                   qvfbmmap.cpp \
-		  qlock.cpp \
- 	          qwssignalhandler.cpp
+                  ../../src/gui/embedded/qlock.cpp \
+                  ../../src/gui/embedded/qwssignalhandler.cpp
 
 include($$QT_SOURCE_TREE/tools/shared/deviceskin/deviceskin.pri)
 
diff --git a/tools/qvfb/qvfbprotocol.cpp b/tools/qvfb/qvfbprotocol.cpp
index b09ed0e..df6c110 100644
--- a/tools/qvfb/qvfbprotocol.cpp
+++ b/tools/qvfb/qvfbprotocol.cpp
@@ -56,6 +56,8 @@
 #include <unistd.h>
 #endif
 
+#include "qvfbshmem.h"
+
 QT_BEGIN_NAMESPACE
 
 QVFbViewProtocol::QVFbViewProtocol(int display_id, QObject *parent) :
@@ -90,7 +92,7 @@ static int openPipe(const char *fileName)
 QVFbKeyPipeProtocol::QVFbKeyPipeProtocol(int display_id)
     : QVFbKeyProtocol(display_id)
 {
-    fileName = QString(QT_VFB_KEYBOARD_PIPE).arg(display_id);
+    fileName = QT_VFB_KEYBOARD_PIPE(display_id);
     fd = openPipe(fileName.toLocal8Bit().constData());
 
     if (fd == -1)
@@ -119,7 +121,7 @@ void QVFbKeyPipeProtocol::sendKeyboardData(QString unicode, int keycode,
 QVFbMousePipe::QVFbMousePipe(int display_id)
     : QVFbMouseProtocol(display_id)
 {
-    fileName = QString(QT_VFB_MOUSE_PIPE).arg(display_id);
+    fileName = QT_VFB_MOUSE_PIPE(display_id);
     fd = openPipe(fileName.toLocal8Bit().constData());
 
     if (fd == -1)
diff --git a/tools/qvfb/qvfbshmem.cpp b/tools/qvfb/qvfbshmem.cpp
index 0d2b3ca..8c4cdb9 100644
--- a/tools/qvfb/qvfbshmem.cpp
+++ b/tools/qvfb/qvfbshmem.cpp
@@ -44,8 +44,6 @@
 #include "qvfbshmem.h"
 #include "qvfbhdr.h"
 
-#define QTE_PIPE "QtEmbedded-%1"
-
 #include <QFile>
 #include <QTimer>
 
@@ -71,7 +69,7 @@ QT_BEGIN_NAMESPACE
 // live.
 static QString qws_dataDir(int qws_display_id)
 {
-    QByteArray dataDir = QString("/tmp/qtembedded-%1").arg(qws_display_id).toLocal8Bit();
+    QByteArray dataDir = QT_VFB_DATADIR(qws_display_id).toLocal8Bit();
     if (mkdir(dataDir, 0700)) {
         if (errno != EEXIST) {
             qFatal("Cannot create Qt for Embedded Linux data directory: %s", dataDir.constData());
@@ -151,6 +149,8 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s,
         }
     }
 
+    displayPipe = qws_dataDir(displayid).append(QTE_PIPE);
+
     kh = new QVFbKeyPipeProtocol(displayid);
     /* should really depend on receiving qt version, but how can
        one tell? */
@@ -209,8 +209,6 @@ QShMemViewProtocol::QShMemViewProtocol(int displayid, const QSize &s,
     hdr->brightness = 255;
     hdr->windowId = 0;
 
-    displayPipe = qws_dataDir(displayid) + QString(QTE_PIPE).arg(displayid);
-
     displayPiped = displayPipe + 'd';
 
 
diff --git a/tools/qvfb/translations/translations.pro b/tools/qvfb/translations/translations.pro
index f667bb8..ef42063 100644
--- a/tools/qvfb/translations/translations.pro
+++ b/tools/qvfb/translations/translations.pro
@@ -9,10 +9,10 @@ HEADERS  = ../qvfb.h \
            ../qvfbprotocol.h \
            ../qvfbshmem.h \
            ../qvfbmmap.h \
-           ../qvfbhdr.h \
-           ../qlock_p.h \
-           ../qwssignalhandler_p.h \
-           ../../shared/deviceskin/deviceskin.cpp
+           ../../../src/gui/embedded/qvfbhdr.h \
+           ../../../src/gui/embedded/qlock_p.h \
+           ../../../src/gui/embedded/qwssignalhandler_p.h \
+           ../../shared/deviceskin/deviceskin.h
 
 SOURCES =  ../qvfb.cpp \
            ../qvfbview.cpp \
@@ -22,12 +22,13 @@ SOURCES =  ../qvfb.cpp \
            ../qvfbprotocol.cpp \
            ../qvfbshmem.cpp \
            ../qvfbmmap.cpp \
-           ../qlock.cpp \
-           ../qwssignalhandler.cpp \
+           ../../../src/gui/embedded/qlock.cpp \
+           ../../../src/gui/embedded/qwssignalhandler.cpp \
            ../../shared/deviceskin/deviceskin.cpp
 
-TRANSLATIONS=$$[QT_INSTALL_TRANSLATIONS]/qvfb_pl.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qvfb_ru.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qvfb_untranslated.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qvfb_zh_CN.ts \
-             $$[QT_INSTALL_TRANSLATIONS]/qvfb_zh_TW.ts
+TR_DIR = $$PWD/../../../translations
+TRANSLATIONS = \
+    $$TR_DIR/qvfb_pl.ts \
+    $$TR_DIR/qvfb_ru.ts \
+    $$TR_DIR/qvfb_zh_CN.ts \
+    $$TR_DIR/qvfb_zh_TW.ts