Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public

Conflicts:
	mkspecs/common/symbian/symbian.conf
	qmake/generators/makefile.h
	qmake/project.cpp
	src/3rdparty/webkit/WebCore/WebCore.pro
	src/src.pro

55 files changed, 624 insertions, 211 deletions

diff --git a/tools/assistant/lib/qhelpcollectionhandler.cpp b/tools/assistant/lib/qhelpcollectionhandler.cpp
index 235f737..bd8dc20 100644
--- a/tools/assistant/lib/qhelpcollectionhandler.cpp
+++ b/tools/assistant/lib/qhelpcollectionhandler.cpp
@@ -114,6 +114,9 @@ bool QHelpCollectionHandler::openCollectionFile()
         return false;
     }
 
+    m_query.exec(QLatin1String("PRAGMA synchronous=OFF"));
+    m_query.exec(QLatin1String("PRAGMA cache_size=3000"));
+
     m_query.exec(QLatin1String("SELECT COUNT(*) FROM sqlite_master WHERE TYPE=\'table\'"
                                "AND Name=\'NamespaceTable\'"));
     m_query.next();
@@ -163,6 +166,9 @@ bool QHelpCollectionHandler::copyCollectionFile(const QString &fileName)
         return false;
     }
 
+    copyQuery->exec(QLatin1String("PRAGMA synchronous=OFF"));
+    copyQuery->exec(QLatin1String("PRAGMA cache_size=3000"));
+
     if (!createTables(copyQuery)) {
         emit error(tr("Cannot copy collection file: %1").arg(colFile));
         return false;
@@ -582,6 +588,8 @@ void QHelpCollectionHandler::optimizeDatabase(const QString &fileName)
         }
 
         QSqlQuery query(db);
+        db.exec(QLatin1String("PRAGMA synchronous=OFF"));
+        db.exec(QLatin1String("PRAGMA cache_size=3000"));
         db.exec(QLatin1String("CREATE INDEX IF NOT EXISTS NameIndex ON IndexTable(Name)"));
         db.exec(QLatin1String("CREATE INDEX IF NOT EXISTS FileNameIndex ON FileNameTable(Name)"));
         db.exec(QLatin1String("CREATE INDEX IF NOT EXISTS FileIdIndex ON FileNameTable(FileId)"));
diff --git a/tools/assistant/lib/qhelpgenerator.cpp b/tools/assistant/lib/qhelpgenerator.cpp
index 783f016..85bdd75 100644
--- a/tools/assistant/lib/qhelpgenerator.cpp
+++ b/tools/assistant/lib/qhelpgenerator.cpp
@@ -191,6 +191,9 @@ bool QHelpGenerator::generate(QHelpDataInterface *helpData,
         return false;
     }
 
+    d->query->exec(QLatin1String("PRAGMA synchronous=OFF"));
+    d->query->exec(QLatin1String("PRAGMA cache_size=3000"));
+
     addProgress(1.0);
     createTables();
     insertFileNotFoundFile();
diff --git a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
index d9dcec5..4baa376 100644
--- a/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
+++ b/tools/assistant/lib/qhelpsearchindexwriter_clucene.cpp
@@ -586,7 +586,7 @@ void QHelpSearchIndexWriter::updateIndex(const QString &collectionFile,
     this->m_indexFilesFolder = indexFilesFolder;
     mutex.unlock();
 
-    start(QThread::NormalPriority);
+    start(QThread::LowestPriority);
 }
 
 void QHelpSearchIndexWriter::optimizeIndex()
diff --git a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp
index cb3e49c..827d145 100644
--- a/tools/assistant/lib/qhelpsearchindexwriter_default.cpp
+++ b/tools/assistant/lib/qhelpsearchindexwriter_default.cpp
@@ -191,7 +191,7 @@ void QHelpSearchIndexWriter::updateIndex(const QString &collectionFile,
     this->m_collectionFile = collectionFile;
     this->m_indexFilesFolder = indexFilesFolder;
 
-    start(QThread::NormalPriority);
+    start(QThread::LowestPriority);
 }
 
 void QHelpSearchIndexWriter::run()
diff --git a/tools/assistant/lib/qhelpsearchresultwidget.cpp b/tools/assistant/lib/qhelpsearchresultwidget.cpp
index 8e476d5..2f5489b 100644
--- a/tools/assistant/lib/qhelpsearchresultwidget.cpp
+++ b/tools/assistant/lib/qhelpsearchresultwidget.cpp
@@ -304,7 +304,7 @@ private:
                 last = resultLastToShow > count ? count : resultLastToShow;
             }
         }
-        hitsLabel->setText(QHelpSearchResultWidget::tr("%1 - %2 of %3 Hits").arg(first).arg(last).arg(count));
+        hitsLabel->setText(QHelpSearchResultWidget::tr("%1 - %2 of %n Hits", 0, count).arg(first).arg(last));
     }
 
 private:
diff --git a/tools/assistant/tools/assistant/assistant.pro b/tools/assistant/tools/assistant/assistant.pro
index cd343bd..eb8cc51 100644
--- a/tools/assistant/tools/assistant/assistant.pro
+++ b/tools/assistant/tools/assistant/assistant.pro
@@ -30,8 +30,6 @@ HEADERS += aboutdialog.h \
     filternamedialog.h \
     helpenginewrapper.h \
     helpviewer.h \
-    helpviewer_qtb.h \
-    helpviewer_qwv.h \
     indexwindow.h \
     installdialog.h \
     mainwindow.h \
@@ -43,6 +41,11 @@ HEADERS += aboutdialog.h \
     tracer.h \
     xbelsupport.h \
     ../shared/collectionconfiguration.h
+contains(QT_CONFIG, webkit) {
+    HEADERS += helpviewer_qwv.h
+} else {
+   HEADERS += helpviewer_qtb.h
+ }
 win32:HEADERS += remotecontrol_win.h
 
 SOURCES += aboutdialog.cpp \
@@ -59,8 +62,6 @@ SOURCES += aboutdialog.cpp \
     filternamedialog.cpp \
     helpenginewrapper.cpp \
     helpviewer.cpp \
-    helpviewer_qtb.cpp \
-    helpviewer_qwv.cpp \
     indexwindow.cpp \
     installdialog.cpp \
     main.cpp \
@@ -71,7 +72,12 @@ SOURCES += aboutdialog.cpp \
     searchwidget.cpp \
     topicchooser.cpp \
     xbelsupport.cpp \
-    ../shared/collectionconfiguration.cpp \
+    ../shared/collectionconfiguration.cpp
+ contains(QT_CONFIG, webkit) {
+    SOURCES += helpviewer_qwv.cpp
+} else {
+    SOURCES += helpviewer_qtb.cpp
+}
 
 FORMS += bookmarkdialog.ui \
     bookmarkmanagerwidget.ui \
diff --git a/tools/assistant/tools/assistant/bookmarkmanager.cpp b/tools/assistant/tools/assistant/bookmarkmanager.cpp
index 70f562e..b9a1b0e 100644
--- a/tools/assistant/tools/assistant/bookmarkmanager.cpp
+++ b/tools/assistant/tools/assistant/bookmarkmanager.cpp
@@ -148,7 +148,7 @@ void BookmarkManager::takeBookmarksMenu(QMenu* menu)
 void BookmarkManager::addBookmark(const QString &title, const QString &url)
 {
     TRACE_OBJ
-    showBookmarkDialog(title.isEmpty() ? tr("Untiled") : title,
+    showBookmarkDialog(title.isEmpty() ? tr("Untitled") : title,
         url.isEmpty() ? QLatin1String("about:blank") : url);
 }
 
diff --git a/tools/assistant/tools/assistant/centralwidget.cpp b/tools/assistant/tools/assistant/centralwidget.cpp
index f56e9e3..2359479 100644
--- a/tools/assistant/tools/assistant/centralwidget.cpp
+++ b/tools/assistant/tools/assistant/centralwidget.cpp
@@ -43,12 +43,16 @@
 #include "centralwidget.h"
 #include "findwidget.h"
 #include "helpenginewrapper.h"
-#include "helpviewer_qtb.h"
-#include "helpviewer_qwv.h"
 #include "searchwidget.h"
 #include "mainwindow.h"
 #include "../shared/collectionconfiguration.h"
 
+#if defined(QT_NO_WEBKIT)
+#include "helpviewer_qtb.h"
+#else
+#include "helpviewer_qwv.h"
+#endif // QT_NO_WEBKIT
+
 #include <QtCore/QTimer>
 
 #include <QtGui/QApplication>
diff --git a/tools/assistant/tools/assistant/cmdlineparser.cpp b/tools/assistant/tools/assistant/cmdlineparser.cpp
index bbc0c37..b6c0beb 100644
--- a/tools/assistant/tools/assistant/cmdlineparser.cpp
+++ b/tools/assistant/tools/assistant/cmdlineparser.cpp
@@ -167,10 +167,10 @@ void CmdLineParser::handleCollectionFileOption()
         const QString &fileName = nextArg();
         m_collectionFile = getFileName(fileName);
         if (m_collectionFile.isEmpty())
-            m_error = tr("The collection file '%1' does not exist!").
+            m_error = tr("The collection file '%1' does not exist.").
                           arg(fileName);
     } else {
-        m_error = tr("Missing collection file!");
+        m_error = tr("Missing collection file.");
     }
 }
 
@@ -183,9 +183,9 @@ void CmdLineParser::handleShowUrlOption()
         if (url.isValid()) {
             m_url = url;
         } else
-            m_error = tr("Invalid URL '%1'!").arg(urlString);
+            m_error = tr("Invalid URL '%1'.").arg(urlString);
     } else {
-        m_error = tr("Missing URL!");
+        m_error = tr("Missing URL.");
     }
 }
 
@@ -223,7 +223,7 @@ void CmdLineParser::handleShowOrHideOrActivateOption(ShowState state)
         else
             m_error = tr("Unknown widget: %1").arg(widget);
     } else {
-        m_error = tr("Missing widget!");
+        m_error = tr("Missing widget.");
     }
 }
 
@@ -246,11 +246,11 @@ void CmdLineParser::handleRegisterOrUnregisterOption(RegisterState state)
         const QString &fileName = nextArg();
         m_helpFile = getFileName(fileName);
         if (m_helpFile.isEmpty())
-            m_error = tr("The Qt help file '%1' does not exist!").arg(fileName);
+            m_error = tr("The Qt help file '%1' does not exist.").arg(fileName);
         else
             m_register = state;
     } else {
-        m_error = tr("Missing help file!");
+        m_error = tr("Missing help file.");
     }
 }
 
@@ -260,7 +260,7 @@ void CmdLineParser::handleSetCurrentFilterOption()
     if (hasMoreArgs())
         m_currentFilter = nextArg();
     else
-        m_error = tr("Missing filter argument!");
+        m_error = tr("Missing filter argument.");
 }
 
 QString CmdLineParser::getFileName(const QString &fileName)
diff --git a/tools/assistant/tools/assistant/findwidget.cpp b/tools/assistant/tools/assistant/findwidget.cpp
index 2e40ab0..60318d4 100644
--- a/tools/assistant/tools/assistant/findwidget.cpp
+++ b/tools/assistant/tools/assistant/findwidget.cpp
@@ -72,6 +72,7 @@ FindWidget::FindWidget(QWidget *parent)
     toolClose = setupToolButton(QLatin1String(""),
         resourcePath + QLatin1String("/closetab.png"));
     hboxLayout->addWidget(toolClose);
+    connect(toolClose, SIGNAL(clicked()), SLOT(hide()));
 
     editFind = new QLineEdit(this);
     hboxLayout->addWidget(editFind);
diff --git a/tools/assistant/tools/assistant/helpenginewrapper.cpp b/tools/assistant/tools/assistant/helpenginewrapper.cpp
index e21e95d..41ad633 100644
--- a/tools/assistant/tools/assistant/helpenginewrapper.cpp
+++ b/tools/assistant/tools/assistant/helpenginewrapper.cpp
@@ -167,6 +167,13 @@ HelpEngineWrapper::HelpEngineWrapper(const QString &collectionFile)
 HelpEngineWrapper::~HelpEngineWrapper()
 {
     TRACE_OBJ
+    const QStringList &namespaces = d->m_helpEngine->registeredDocumentations();
+    foreach (const QString &nameSpace, namespaces) {
+        const QString &docFile
+            = d->m_helpEngine->documentationFileName(nameSpace);
+        d->m_qchWatcher->removePath(docFile);
+    }
+
     delete d;
 }
 
diff --git a/tools/assistant/tools/assistant/helpviewer.h b/tools/assistant/tools/assistant/helpviewer.h
index 0bfe904..9e8f5f4 100644
--- a/tools/assistant/tools/assistant/helpviewer.h
+++ b/tools/assistant/tools/assistant/helpviewer.h
@@ -53,7 +53,7 @@ class AbstractHelpViewer
 {
 public:
     AbstractHelpViewer();
-    ~AbstractHelpViewer();
+    virtual ~AbstractHelpViewer();
 
     virtual QFont viewerFont() const = 0;
     virtual void setViewerFont(const QFont &font) = 0;
diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.cpp b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
index bba2850..07b89eb 100644
--- a/tools/assistant/tools/assistant/helpviewer_qtb.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qtb.cpp
@@ -40,8 +40,6 @@
 ****************************************************************************/
 #include "helpviewer_qtb.h"
 
-#if defined(QT_NO_WEBKIT)
-
 #include "centralwidget.h"
 #include "helpenginewrapper.h"
 #include "tracer.h"
@@ -287,7 +285,3 @@ bool HelpViewer::eventFilter(QObject *obj, QEvent *event)
         return true;
     return QTextBrowser::eventFilter(obj, event);
 }
-
-QT_END_NAMESPACE
-
-#endif  // QT_NO_WEBKIT
diff --git a/tools/assistant/tools/assistant/helpviewer_qtb.h b/tools/assistant/tools/assistant/helpviewer_qtb.h
index 5b38870..a05782c 100644
--- a/tools/assistant/tools/assistant/helpviewer_qtb.h
+++ b/tools/assistant/tools/assistant/helpviewer_qtb.h
@@ -41,10 +41,6 @@
 #ifndef HELPVIEWERQTB_H
 #define HELPVIEWERQTB_H
 
-#include <QtCore/qglobal.h>
-
-#if defined(QT_NO_WEBKIT)
-
 #include "helpviewer.h"
 
 #include <QtCore/QUrl>
@@ -111,6 +107,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif  // QT_NO_WEBKIT
-
 #endif  // HELPVIEWERQTB_H
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.cpp b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
index 9bb66e1..582d013 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.cpp
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.cpp
@@ -41,8 +41,6 @@
 
 #include "helpviewer_qwv.h"
 
-#if !defined(QT_NO_WEBKIT)
-
 #include "centralwidget.h"
 #include "helpenginewrapper.h"
 #include "tracer.h"
@@ -223,7 +221,7 @@ bool HelpPage::acceptNavigationRequest(QWebFrame *,
     if (type == QWebPage::NavigationTypeLinkClicked
         && (m_keyboardModifiers & Qt::ControlModifier
         || m_pressedButtons == Qt::MidButton)) {
-            if (HelpViewer* viewer = centralWidget->newEmptyTab())
+            if (centralWidget->newEmptyTab())
                 centralWidget->setSource(url);
             m_pressedButtons = Qt::NoButton;
             m_keyboardModifiers = Qt::NoModifier;
@@ -385,5 +383,3 @@ void HelpViewer::setLoadFinished(bool ok)
 }
 
 QT_END_NAMESPACE
-
-#endif  // !QT_NO_WEBKIT
diff --git a/tools/assistant/tools/assistant/helpviewer_qwv.h b/tools/assistant/tools/assistant/helpviewer_qwv.h
index fbfbaac..41ee553 100644
--- a/tools/assistant/tools/assistant/helpviewer_qwv.h
+++ b/tools/assistant/tools/assistant/helpviewer_qwv.h
@@ -42,10 +42,6 @@
 #ifndef HELPVIEWERQWV_H
 #define HELPVIEWERQWV_H
 
-#include <QtCore/qglobal.h>
-
-#if !defined(QT_NO_WEBKIT)
-
 #include "helpviewer.h"
 
 #include <QtGui/QAction>
@@ -120,6 +116,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif  // !QT_NO_WEBKIT
-
 #endif  // HELPVIEWERQWV_H
diff --git a/tools/assistant/tools/assistant/main.cpp b/tools/assistant/tools/assistant/main.cpp
index 77e5e7c..51ea9f9 100644
--- a/tools/assistant/tools/assistant/main.cpp
+++ b/tools/assistant/tools/assistant/main.cpp
@@ -292,7 +292,7 @@ void setupTranslation(const QString &fileName, const QString &dir)
     QTranslator *translator = new QTranslator(QCoreApplication::instance());
     if (translator->load(fileName, dir)) {
         QCoreApplication::installTranslator(translator);
-    } else {
+    } else if (!fileName.endsWith(QLatin1String("en_US"))) {
         qWarning("Could not load translation file %s in directory %s.",
                  qPrintable(fileName), qPrintable(dir));
     }
diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp
index 8096218..687e6bc 100644
--- a/tools/assistant/tools/assistant/mainwindow.cpp
+++ b/tools/assistant/tools/assistant/mainwindow.cpp
@@ -341,7 +341,7 @@ void MainWindow::lookForNewQtDocumentation()
 
     m_qtDocInstaller = new QtDocInstaller(qtDocInfos);
     connect(m_qtDocInstaller, SIGNAL(docsInstalled(bool)), this,
-        SLOT(qtDocumentationInstalled(bool)));
+        SLOT(qtDocumentationInstalled()));
     connect(m_qtDocInstaller, SIGNAL(qchFileNotFound(QString)), this,
             SLOT(resetQtDocInfo(QString)));
     connect(m_qtDocInstaller, SIGNAL(registerDocumentation(QString, QString)),
@@ -351,7 +351,7 @@ void MainWindow::lookForNewQtDocumentation()
     m_qtDocInstaller->installDocs();
 }
 
-void MainWindow::qtDocumentationInstalled(bool newDocsInstalled)
+void MainWindow::qtDocumentationInstalled()
 {
     TRACE_OBJ
     statusBar()->clearMessage();
diff --git a/tools/assistant/tools/assistant/mainwindow.h b/tools/assistant/tools/assistant/mainwindow.h
index 40ca624..8e4276d 100644
--- a/tools/assistant/tools/assistant/mainwindow.h
+++ b/tools/assistant/tools/assistant/mainwindow.h
@@ -112,7 +112,7 @@ private slots:
     void lookForNewQtDocumentation();
     void indexingStarted();
     void indexingFinished();
-    void qtDocumentationInstalled(bool newDocsInstalled);
+    void qtDocumentationInstalled();
     void registerDocumentation(const QString &component,
         const QString &absFileName);
     void resetQtDocInfo(const QString &component);
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 0ff7301..6b7740e 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -249,6 +249,7 @@ Configure::Configure( int& argc, char** argv )
     dictionary[ "MULTIMEDIA" ]      = "yes";
     dictionary[ "AUDIO_BACKEND" ]   = "auto";
     dictionary[ "MEDIASERVICE"]     = "auto";
+    dictionary[ "WMSDK" ]           = "auto";
     dictionary[ "DIRECTSHOW" ]      = "no";
     dictionary[ "WEBKIT" ]          = "auto";
     dictionary[ "DECLARATIVE" ]     = "auto";
@@ -1592,6 +1593,7 @@ bool Configure::displayHelp()
                     "[-qtnamespace <namespace>] [-qtlibinfix <infix>] [-no-phonon]\n"
                     "[-phonon] [-no-phonon-backend] [-phonon-backend]\n"
                     "[-no-multimedia] [-multimedia] [-no-audio-backend] [-audio-backend]\n"
+                    "[-no-mediaservice] [-mediaservice]\n"
                     "[-no-script] [-script] [-no-scripttools] [-scripttools]\n"
                     "[-no-webkit] [-webkit] [-graphicssystem raster|opengl|openvg]\n\n", 0, 7);
 
@@ -2077,6 +2079,8 @@ 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 == "WMSDK") {
+        available = findFile("wmsdk.h");
     } else if (part == "MULTIMEDIA" || part == "SCRIPT" || part == "SCRIPTTOOLS") {
         available = true;
     } else if (part == "WEBKIT") {
@@ -2221,6 +2225,8 @@ void Configure::autoDetection()
         dictionary["AUDIO_BACKEND"] = checkAvailability("AUDIO_BACKEND") ? "yes" : "no";
     if (dictionary["MEDIASERVICE"] == "auto")
         dictionary["MEDIASERVICE"] = checkAvailability("MEDIASERVICE") ? "yes" : "no";
+    if (dictionary["WMSDK"] == "auto")
+        dictionary["WMSDK"] = checkAvailability("WMSDK") ? "yes" : "no";
 
     // Qt/WinCE remote test application
     if (dictionary["CETEST"] == "auto")
@@ -2611,8 +2617,11 @@ void Configure::generateOutputVars()
         qtConfig += "multimedia";
         if (dictionary["AUDIO_BACKEND"] == "yes")
             qtConfig += "audio-backend";
-        if (dictionary["MEDIASERVICE"] == "yes")
+        if (dictionary["MEDIASERVICE"] == "yes") {
             qtConfig += "mediaservice";
+            if (dictionary["WMSDK"] == "yes")
+                qtConfig += "wmsdk";
+        }
     }
 
     if (dictionary["WEBKIT"] == "yes")
@@ -3723,7 +3732,7 @@ void Configure::generateMakefiles()
                     QTextStream txt(&file);
                     txt << "all:\n";
                     txt << "\t" << args.join(" ") << "\n";
-                    txt << "\t" << dictionary[ "MAKE" ] << " -f " << it->target << "\n";
+                    txt << "\t\"$(MAKE)\" -$(MAKEFLAGS) -f " << it->target << "\n";
                     txt << "first: all\n";
                     txt << "qmake:\n";
                     txt << "\t" << args.join(" ") << "\n";
diff --git a/tools/designer/src/lib/shared/formwindowbase.cpp b/tools/designer/src/lib/shared/formwindowbase.cpp
index 2c5efbf..5292f5f 100644
--- a/tools/designer/src/lib/shared/formwindowbase.cpp
+++ b/tools/designer/src/lib/shared/formwindowbase.cpp
@@ -72,6 +72,7 @@
 #include <QtGui/QStatusBar>
 #include <QtGui/QMenu>
 #include <QtGui/QAction>
+#include <QtGui/QLabel>
 
 QT_BEGIN_NAMESPACE
 
@@ -181,7 +182,17 @@ void FormWindowBase::reloadProperties()
         QMapIterator<int, bool> itIndex(itSheet.value());
         while (itIndex.hasNext()) {
             const int index = itIndex.next().key();
-            sheet->setProperty(index, sheet->property(index));
+            const QVariant newValue = sheet->property(index);
+            if (qobject_cast<QLabel *>(sheet->object()) && sheet->propertyName(index) == QLatin1String("text")) {
+                const PropertySheetStringValue newString = qVariantValue<PropertySheetStringValue>(newValue);
+                // optimize a bit, reset only if the text value might contain a reference to qt resources
+                // (however reloading of icons other than taken from resources might not work here)
+                if (newString.value().contains(QLatin1String(":/"))) {
+                    const QVariant resetValue = qVariantFromValue(PropertySheetStringValue());
+                    sheet->setProperty(index, resetValue);
+                }
+            }
+            sheet->setProperty(index, newValue);
         }
         if (QTabWidget *tabWidget = qobject_cast<QTabWidget *>(sheet->object())) {
             const int count = tabWidget->count();
diff --git a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp
index 13bb1d7..77ab2a6 100644
--- a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp
@@ -271,6 +271,7 @@ bool QDesignerPropertySheetPrivate::isReloadableProperty(int index) const
 {
     return isResourceProperty(index)
            || propertyType(index) == QDesignerPropertySheet::PropertyStyleSheet
+           || propertyType(index) == QDesignerPropertySheet::PropertyText
            || q->property(index).type() == QVariant::Url;
 }
 
@@ -549,6 +550,7 @@ QDesignerPropertySheet::PropertyType QDesignerPropertySheet::propertyTypeFromNam
         propertyTypeHash.insert(QLatin1String("windowModality"),          PropertyWindowModality);
         propertyTypeHash.insert(QLatin1String("windowModified"),          PropertyWindowModified);
         propertyTypeHash.insert(QLatin1String("styleSheet"),              PropertyStyleSheet);
+        propertyTypeHash.insert(QLatin1String("text"),                    PropertyText);
     }
     return propertyTypeHash.value(name, PropertyNone);
 }
diff --git a/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h b/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h
index 9db7367..0105eac 100644
--- a/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h
+++ b/tools/designer/src/lib/shared/qdesigner_propertysheet_p.h
@@ -176,7 +176,8 @@ public:
                         PropertyWindowIconText,
                         PropertyWindowModality,
                         PropertyWindowModified,
-                        PropertyStyleSheet
+                        PropertyStyleSheet,
+                        PropertyText
     };
 
     enum ObjectType { ObjectNone, ObjectLabel, ObjectLayout, ObjectLayoutWidget, ObjectQ3GroupBox };
diff --git a/tools/designer/src/plugins/plugins.pro b/tools/designer/src/plugins/plugins.pro
index baf5261..cf4fa8a 100644
--- a/tools/designer/src/plugins/plugins.pro
+++ b/tools/designer/src/plugins/plugins.pro
@@ -7,3 +7,4 @@ win32:!contains(QT_EDITION, OpenSource):SUBDIRS += activeqt
 # contains(QT_CONFIG, opengl): SUBDIRS += tools/view3d
 contains(QT_CONFIG, webkit): SUBDIRS += qwebview
 contains(QT_CONFIG, phonon): SUBDIRS += phononwidgets
+contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativeview
diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
new file mode 100644
index 0000000..b8abe87
--- /dev/null
+++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro
@@ -0,0 +1,13 @@
+TEMPLATE    = lib
+TARGET      = qdeclarativeview
+CONFIG     += qt warn_on plugin designer
+QT         += declarative
+
+include(../plugins.pri)
+build_all:!build_pass {
+    CONFIG -= build_all
+    CONFIG += release
+}
+
+SOURCES += qdeclarativeview_plugin.cpp
+HEADERS += qdeclarativeview_plugin.h
diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
new file mode 100644
index 0000000..b352a9b
--- /dev/null
+++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.cpp
@@ -0,0 +1,132 @@
+/****************************************************************************
+**
+** 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 Qt Designer 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 "qdeclarativeview_plugin.h"
+
+#include <QtDesigner/QExtensionFactory>
+#include <QtDesigner/QExtensionManager>
+
+#include <QtCore/qplugin.h>
+#include <QtDeclarative/QDeclarativeView>
+
+static const char toolTipC[] = "QtDeclarative view widget";
+
+QT_BEGIN_NAMESPACE
+
+QDeclarativeViewPlugin::QDeclarativeViewPlugin(QObject *parent) :
+    QObject(parent),
+    m_initialized(false)
+{
+}
+
+QString QDeclarativeViewPlugin::name() const
+{
+    return QLatin1String("QDeclarativeView");
+}
+
+QString QDeclarativeViewPlugin::group() const
+{
+    return QLatin1String("Display Widgets");
+}
+
+QString QDeclarativeViewPlugin::toolTip() const
+{
+    return QString(QLatin1String(toolTipC));
+}
+
+QString QDeclarativeViewPlugin::whatsThis() const
+{
+    return QString(QLatin1String(toolTipC));
+}
+
+QString QDeclarativeViewPlugin::includeFile() const
+{
+    return QLatin1String("QtDeclarative/QDeclarativeView");
+}
+
+QIcon QDeclarativeViewPlugin::icon() const
+{
+    return QIcon();
+}
+
+bool QDeclarativeViewPlugin::isContainer() const
+{
+    return false;
+}
+
+QWidget *QDeclarativeViewPlugin::createWidget(QWidget *parent)
+{
+    return new QDeclarativeView(parent);
+}
+
+bool QDeclarativeViewPlugin::isInitialized() const
+{
+    return m_initialized;
+}
+
+void QDeclarativeViewPlugin::initialize(QDesignerFormEditorInterface * /*core*/)
+{
+    if (m_initialized)
+        return;
+
+    m_initialized = true;
+}
+
+QString QDeclarativeViewPlugin::domXml() const
+{
+    return QLatin1String("\
+    <ui language=\"c++\">\
+        <widget class=\"QDeclarativeView\" name=\"declarativeView\">\
+            <property name=\"geometry\">\
+                <rect>\
+                    <x>0</x>\
+                    <y>0</y>\
+                    <width>300</width>\
+                    <height>200</height>\
+                </rect>\
+            </property>\
+        </widget>\
+    </ui>");
+}
+
+Q_EXPORT_PLUGIN2(customwidgetplugin, QDeclarativeViewPlugin)
+
+QT_END_NAMESPACE
diff --git a/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h
new file mode 100644
index 0000000..2f13f16
--- /dev/null
+++ b/tools/designer/src/plugins/qdeclarativeview/qdeclarativeview_plugin.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** 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 Qt Designer 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 QDECLARATIVEVIEW_PLUGIN_H
+#define QDECLARATIVEVIEW_PLUGIN_H
+
+#include <QtDesigner/QDesignerCustomWidgetInterface>
+
+QT_BEGIN_NAMESPACE
+
+class QDeclarativeViewPlugin: public QObject, public QDesignerCustomWidgetInterface
+{
+    Q_OBJECT
+    Q_INTERFACES(QDesignerCustomWidgetInterface)
+public:
+    QDeclarativeViewPlugin(QObject *parent = 0);
+
+    virtual QString name() const;
+    virtual QString group() const;
+    virtual QString toolTip() const;
+    virtual QString whatsThis() const;
+    virtual QString includeFile() const;
+    virtual QIcon icon() const;
+    virtual bool isContainer() const;
+    virtual QWidget *createWidget(QWidget *parent);
+    virtual bool isInitialized() const;
+    virtual void initialize(QDesignerFormEditorInterface *core);
+    virtual QString domXml() const;
+
+private:
+    bool m_initialized;
+};
+
+QT_END_NAMESPACE
+
+#endif // QDECLARATIVEVIEW_PLUGIN_H
diff --git a/tools/linguist/lupdate/cpp.cpp b/tools/linguist/lupdate/cpp.cpp
index 6bd9108..2d5620e 100644
--- a/tools/linguist/lupdate/cpp.cpp
+++ b/tools/linguist/lupdate/cpp.cpp
@@ -260,6 +260,8 @@ private:
     bool qualifyOneCallbackOwn(const Namespace *ns, void *context) const;
     bool qualifyOneCallbackUsing(const Namespace *ns, void *context) const;
     bool qualifyOne(const NamespaceList &namespaces, int nsCnt, const HashString &segment,
+                    NamespaceList *resolved, QSet<HashStringList> *visitedUsings) const;
+    bool qualifyOne(const NamespaceList &namespaces, int nsCnt, const HashString &segment,
                     NamespaceList *resolved) const;
     bool fullyQualify(const NamespaceList &namespaces, int nsCnt,
                       const QList<HashString> &segments, bool isDeclaration,
@@ -1036,15 +1038,16 @@ 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)
+    QualifyOneData(const NamespaceList &ns, int nsc, const HashString &seg, NamespaceList *rslvd,
+                   QSet<HashStringList> *visited)
+        : namespaces(ns), nsCount(nsc), segment(seg), resolved(rslvd), visitedUsings(visited)
     {}
 
     const NamespaceList &namespaces;
     int nsCount;
     const HashString &segment;
     NamespaceList *resolved;
-    QSet<HashStringList> visitedUsings;
+    QSet<HashStringList> *visitedUsings;
 };
 
 bool CppParser::qualifyOneCallbackOwn(const Namespace *ns, void *context) const
@@ -1078,18 +1081,19 @@ bool CppParser::qualifyOneCallbackUsing(const Namespace *ns, void *context) cons
 {
     QualifyOneData *data = (QualifyOneData *)context;
     foreach (const HashStringList &use, ns->usings)
-        if (!data->visitedUsings.contains(use)) {
-            data->visitedUsings.insert(use);
-            if (qualifyOne(use.value(), use.value().count(), data->segment, data->resolved))
+        if (!data->visitedUsings->contains(use)) {
+            data->visitedUsings->insert(use);
+            if (qualifyOne(use.value(), use.value().count(), data->segment, data->resolved,
+                           data->visitedUsings))
                 return true;
         }
     return false;
 }
 
 bool CppParser::qualifyOne(const NamespaceList &namespaces, int nsCnt, const HashString &segment,
-                           NamespaceList *resolved) const
+                           NamespaceList *resolved, QSet<HashStringList> *visitedUsings) const
 {
-    QualifyOneData data(namespaces, nsCnt, segment, resolved);
+    QualifyOneData data(namespaces, nsCnt, segment, resolved, visitedUsings);
 
     if (visitNamespace(namespaces, nsCnt, &CppParser::qualifyOneCallbackOwn, &data))
         return true;
@@ -1097,6 +1101,14 @@ bool CppParser::qualifyOne(const NamespaceList &namespaces, int nsCnt, const Has
     return visitNamespace(namespaces, nsCnt, &CppParser::qualifyOneCallbackUsing, &data);
 }
 
+bool CppParser::qualifyOne(const NamespaceList &namespaces, int nsCnt, const HashString &segment,
+                           NamespaceList *resolved) const
+{
+    QSet<HashStringList> visitedUsings;
+
+    return qualifyOne(namespaces, nsCnt, segment, resolved, &visitedUsings);
+}
+
 bool CppParser::fullyQualify(const NamespaceList &namespaces, int nsCnt,
                              const QList<HashString> &segments, bool isDeclaration,
                              NamespaceList *resolved, QStringList *unresolved) const
diff --git a/tools/linguist/phrasebooks/russian.qph b/tools/linguist/phrasebooks/russian.qph
index 9d40bd3..ae1a9b9 100644
--- a/tools/linguist/phrasebooks/russian.qph
+++ b/tools/linguist/phrasebooks/russian.qph
@@ -1164,4 +1164,44 @@
     <source>Table of Contents</source>
     <target>Оглавление</target>
 </phrase>
+<phrase>
+    <source>parse</source>
+    <target>разобрать</target>
+</phrase>
+<phrase>
+    <source>parsing</source>
+    <target>разбор</target>
+</phrase>
+<phrase>
+    <source>phrasebook</source>
+    <target>глоссарий</target>
+</phrase>
+<phrase>
+    <source>phrase book</source>
+    <target>глоссарий</target>
+</phrase>
+<phrase>
+    <source>In use</source>
+    <target>Используется</target>
+</phrase>
+<phrase>
+    <source>Access denied</source>
+    <target>Доступ запрещён</target>
+</phrase>
+<phrase>
+    <source>No error</source>
+    <target>Нет ошибки</target>
+</phrase>
+<phrase>
+    <source>Not supported</source>
+    <target>Не поддерживается</target>
+</phrase>
+<phrase>
+    <source>Already exists</source>
+    <target>Уже существует</target>
+</phrase>
+<phrase>
+    <source>Permission denied</source>
+    <target>Доступ запрещён</target>
+</phrase>
 </QPH>
diff --git a/tools/qdbus/qdbus/qdbus.cpp b/tools/qdbus/qdbus/qdbus.cpp
index b08910a..ce18cb9 100644
--- a/tools/qdbus/qdbus/qdbus.cpp
+++ b/tools/qdbus/qdbus/qdbus.cpp
@@ -249,116 +249,123 @@ static QStringList readList(QStringList &args)
 }
 
 static int placeCall(const QString &service, const QString &path, const QString &interface,
-               const QString &member, QStringList args, bool try_prop=true)
+               const QString &member, const QStringList& arguments, bool try_prop=true)
 {
     QDBusInterface iface(service, path, interface, connection);
 
     // Don't check whether the interface is valid to allow DBus try to
     // activate the service if possible.
 
+    QList<int> knownIds;
+    bool matchFound = false;
+    QStringList args = arguments;
     QVariantList params;
     if (!args.isEmpty()) {
         const QMetaObject *mo = iface.metaObject();
         QByteArray match = member.toLatin1();
         match += '(';
 
-        int midx = -1;
         for (int i = mo->methodOffset(); i < mo->methodCount(); ++i) {
             QMetaMethod mm = mo->method(i);
             QByteArray signature = mm.signature();
-            if (signature.startsWith(match)) {
-                midx = i;
-                break;
-            }
+            if (signature.startsWith(match))
+                knownIds += i;
          }
 
-        if (midx == -1) {
-            // Failed to set property after falling back?
-            // Bail out without displaying an error
-            if (!try_prop)
+
+        while (!matchFound) {
+            args = arguments; // reset
+            params.clear();
+            if (knownIds.isEmpty()) {
+                // Failed to set property after falling back?
+                // Bail out without displaying an error
+                if (!try_prop)
+                    return 1;
+                if (try_prop && args.size() == 1) {
+                    QStringList proparg;
+                    proparg += interface;
+                    proparg += member;
+                    proparg += args.first();
+                    if (!placeCall(service, path, "org.freedesktop.DBus.Properties", "Set", proparg, false))
+                        return 0;
+                }
+                fprintf(stderr, "Cannot find '%s.%s' in object %s at %s\n",
+                        qPrintable(interface), qPrintable(member), qPrintable(path),
+                        qPrintable(service));
                 return 1;
-            if (try_prop && args.size() == 1) {
-                QStringList proparg;
-                proparg += interface;
-                proparg += member;
-                proparg += args.first();
-                if (!placeCall(service, path, "org.freedesktop.DBus.Properties", "Set", proparg, false))
-                    return 0;
             }
-            fprintf(stderr, "Cannot find '%s.%s' in object %s at %s\n",
-                    qPrintable(interface), qPrintable(member), qPrintable(path),
-                    qPrintable(service));
-            return 1;
-        }
 
-        QMetaMethod mm = mo->method(midx);
-        QList<QByteArray> types = mm.parameterTypes();
-        for (int i = 0; i < types.count(); ++i) {
-            if (types.at(i).endsWith('&')) {
-                // reference (and not a reference to const): output argument
-                // we're done with the inputs
-                while (types.count() > i)
-                    types.removeLast();
-                break;
+            QMetaMethod mm = mo->method(knownIds.takeFirst());
+            QList<QByteArray> types = mm.parameterTypes();
+            for (int i = 0; i < types.count(); ++i) {
+                if (types.at(i).endsWith('&')) {
+                    // reference (and not a reference to const): output argument
+                    // we're done with the inputs
+                    while (types.count() > i)
+                        types.removeLast();
+                    break;
+                }
             }
-        }
 
-        for (int i = 0; !args.isEmpty() && i < types.count(); ++i) {
-            int id = QVariant::nameToType(types.at(i));
-            if (id == QVariant::UserType)
-                id = QMetaType::type(types.at(i));
-            Q_ASSERT(id);
-
-            QVariant p;
-            QString argument;
-            if ((id == QVariant::List || id == QVariant::StringList)
-                 && args.at(0) == QLatin1String("("))
-                p = readList(args);
-            else
-                p = argument = args.takeFirst();
-
-            if (id == int(QMetaType::UChar)) {
-                // special case: QVariant::convert doesn't convert to/from
-                // UChar because it can't decide if it's a character or a number
-                p = qVariantFromValue<uchar>(p.toUInt());
-            } else if (id < int(QMetaType::User) && id != int(QVariant::Map)) {
-                p.convert(QVariant::Type(id));
-                if (p.type() == QVariant::Invalid) {
-                    fprintf(stderr, "Could not convert '%s' to type '%s'.\n",
-                            qPrintable(argument), types.at(i).constData());
-                    return 1 ;
-                }
-            } else if (id == qMetaTypeId<QDBusVariant>()) {
-                QDBusVariant tmp(p);
-                p = qVariantFromValue(tmp);
-            } else if (id == qMetaTypeId<QDBusObjectPath>()) {
-                QDBusObjectPath path(argument);
-                if (path.path().isNull()) {
-                    fprintf(stderr, "Cannot pass argument '%s' because it is not a valid object path.\n",
-                            qPrintable(argument));
+            for (int i = 0; !args.isEmpty() && i < types.count(); ++i) {
+                int id = QVariant::nameToType(types.at(i));
+                if (id == QVariant::UserType)
+                    id = QMetaType::type(types.at(i));
+                Q_ASSERT(id);
+
+                QVariant p;
+                QString argument;
+                if ((id == QVariant::List || id == QVariant::StringList)
+                     && args.at(0) == QLatin1String("("))
+                    p = readList(args);
+                else
+                    p = argument = args.takeFirst();
+
+                if (id == int(QMetaType::UChar)) {
+                    // special case: QVariant::convert doesn't convert to/from
+                    // UChar because it can't decide if it's a character or a number
+                    p = qVariantFromValue<uchar>(p.toUInt());
+                } else if (id < int(QMetaType::User) && id != int(QVariant::Map)) {
+                    p.convert(QVariant::Type(id));
+                    if (p.type() == QVariant::Invalid) {
+                        fprintf(stderr, "Could not convert '%s' to type '%s'.\n",
+                                qPrintable(argument), types.at(i).constData());
+                        return 1 ;
+                    }
+                } else if (id == qMetaTypeId<QDBusVariant>()) {
+                    QDBusVariant tmp(p);
+                    p = qVariantFromValue(tmp);
+                } else if (id == qMetaTypeId<QDBusObjectPath>()) {
+                    QDBusObjectPath path(argument);
+                    if (path.path().isNull()) {
+                        fprintf(stderr, "Cannot pass argument '%s' because it is not a valid object path.\n",
+                                qPrintable(argument));
+                        return 1;
+                    }
+                    p = qVariantFromValue(path);
+                } else if (id == qMetaTypeId<QDBusSignature>()) {
+                    QDBusSignature sig(argument);
+                    if (sig.signature().isNull()) {
+                        fprintf(stderr, "Cannot pass argument '%s' because it is not a valid signature.\n",
+                                qPrintable(argument));
+                        return 1;
+                    }
+                    p = qVariantFromValue(sig);
+                } else {
+                    fprintf(stderr, "Sorry, can't pass arg of type '%s'.\n",
+                            types.at(i).constData());
                     return 1;
                 }
-                p = qVariantFromValue(path);
-            } else if (id == qMetaTypeId<QDBusSignature>()) {
-                QDBusSignature sig(argument);
-                if (sig.signature().isNull()) {
-                    fprintf(stderr, "Cannot pass argument '%s' because it is not a valid signature.\n",
-                            qPrintable(argument));
-                    return 1;
-                }
-                p = qVariantFromValue(sig);
-            } else {
-                fprintf(stderr, "Sorry, can't pass arg of type '%s'.\n",
-                        types.at(i).constData());
+                params += p;
+            }
+            if (params.count() == types.count() && args.isEmpty())
+                matchFound = true;
+            else if (knownIds.isEmpty()) {
+                fprintf(stderr, "Invalid number of parameters\n");
                 return 1;
             }
-            params += p;
-        }
-        if (params.count() != types.count() || !args.isEmpty()) {
-            fprintf(stderr, "Invalid number of parameters\n");
-            return 1;
-        }
-    }
+        } // while (!matchFound)
+    } // if (!args.isEmpty()
 
     QDBusMessage reply = iface.callWithArgumentList(QDBus::Block, member, params);
     if (reply.type() == QDBusMessage::ErrorMessage) {
diff --git a/tools/qdoc3/codeparser.cpp b/tools/qdoc3/codeparser.cpp
index 5ae63ac..042378e 100644
--- a/tools/qdoc3/codeparser.cpp
+++ b/tools/qdoc3/codeparser.cpp
@@ -43,7 +43,6 @@
   codeparser.cpp
 */
 
-#include <QtCore>
 #include "codeparser.h"
 #include "node.h"
 #include "tree.h"
diff --git a/tools/qdoc3/command.cpp b/tools/qdoc3/command.cpp
index 76b483c..b78ad07 100644
--- a/tools/qdoc3/command.cpp
+++ b/tools/qdoc3/command.cpp
@@ -47,6 +47,8 @@
 
 #include "command.h"
 
+#include <stdlib.h>
+
 QT_BEGIN_NAMESPACE
 
 void executeCommand(const Location& location,
@@ -69,6 +71,12 @@ void executeCommand(const Location& location,
     if (space != -1)
 	toolName.truncate(space);
 
+#ifdef QT_BOOTSTRAPPED
+    int status = system(qPrintable(actualCommand));
+    int exitCode = WEXITSTATUS(status);
+    if (status == -1 || exitCode != EXIT_SUCCESS)
+        location.fatal(QString("Error executing '$1': $2").arg(toolName).arg(exitCode));
+#else
     QProcess process;
     process.start(QLatin1String("sh"),
         QStringList() << QLatin1String("-c") << actualCommand);
@@ -89,6 +97,7 @@ void executeCommand(const Location& location,
                        tr("The tool was invoked like this:\n%1\n"
                           "It emitted these errors:\n%2")
                        .arg(actualCommand).arg(errors));
+#endif
 }
 
 QT_END_NAMESPACE
diff --git a/tools/qdoc3/config.cpp b/tools/qdoc3/config.cpp
index acb1576..3150f28 100644
--- a/tools/qdoc3/config.cpp
+++ b/tools/qdoc3/config.cpp
@@ -43,7 +43,11 @@
   config.cpp
 */
 
-#include <QtCore>
+#include <QDir>
+#include <QVariant>
+#include <QFile>
+#include <QTemporaryFile>
+#include <QTextStream>
 
 #include "archiveextractor.h"
 #include "config.h"
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp
index 021d64a..6884781 100644
--- a/tools/qdoc3/cppcodeparser.cpp
+++ b/tools/qdoc3/cppcodeparser.cpp
@@ -43,11 +43,11 @@
   cppcodeparser.cpp
 */
 
-#include <QtCore>
 #include <qfile.h>
 
 #include <stdio.h>
 #include <errno.h>
+#include <qdebug.h>
 
 #include "codechunk.h"
 #include "config.h"
@@ -1034,7 +1034,7 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc,
     else if (command == COMMAND_QMLINHERITS) {
         setLink(node, Node::InheritsLink, arg);
         if (node->subType() == Node::QmlClass) {
-            QmlClassNode::addInheritedBy(arg,node->name());
+            QmlClassNode::addInheritedBy(arg,node);
         }
    }
     else if (command == COMMAND_QMLDEFAULT) {
@@ -1651,8 +1651,9 @@ bool CppCodeParser::matchNamespaceDecl(InnerNode *parent)
     */
     QString namespaceName = previousLexeme();
     NamespaceNode *namespasse = 0;
-    if (parent)
+    if (parent) {
         namespasse = static_cast<NamespaceNode*>(parent->findNode(namespaceName, Node::Namespace));
+    }
     if (!namespasse) {
         namespasse = new NamespaceNode(parent, namespaceName);
         namespasse->setAccess(access);
diff --git a/tools/qdoc3/doc.h b/tools/qdoc3/doc.h
index e98bb26..3e76456 100644
--- a/tools/qdoc3/doc.h
+++ b/tools/qdoc3/doc.h
@@ -48,6 +48,7 @@
 
 #include <QSet>
 #include <QString>
+#include <QMap>
 
 #include "location.h"
 
diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index 6a8899a..80f7e45 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -42,7 +42,6 @@
 /*
   generator.cpp
 */
-#include <QtCore>
 #include <qdir.h>
 #include <qdebug.h>
 #include "codemarker.h"
@@ -227,6 +226,7 @@ void Generator::terminate()
     imageFiles.clear();
     imageDirs.clear();
     outDir = "";
+    QmlClassNode::clear();
 }
 
 Generator *Generator::generatorForFormat(const QString& format)
@@ -1186,6 +1186,31 @@ void Generator::appendSortedNames(Text& text,
     }
 }
 
+void Generator::appendSortedQmlNames(Text& text,
+                                     const Node* base,
+                                     const NodeList& subs,
+                                     CodeMarker *marker)
+{
+    QMap<QString,Text> classMap;
+    int index = 0;
+
+    qDebug() << "Generator::appendSortedQmlNames():" << base->name() << "is inherited by...";
+    for (int i = 0; i < subs.size(); ++i) {
+        Text t;
+        qDebug() << "    " << subs[i]->name();
+        appendFullName(t, subs[i], base, marker);
+        classMap[t.toString().toLower()] = t;
+    }
+
+    QStringList names = classMap.keys();
+    names.sort();
+
+    foreach (const QString &name, names) {
+        text << classMap[name];
+        text << separator(index++, names.count());
+    }
+}
+
 int Generator::skipAtoms(const Atom *atom, Atom::Type type) const
 {
     int skipAhead = 0;
diff --git a/tools/qdoc3/generator.h b/tools/qdoc3/generator.h
index 44f56e2..30d9af4 100644
--- a/tools/qdoc3/generator.h
+++ b/tools/qdoc3/generator.h
@@ -169,6 +169,13 @@ class Generator
                            const QList<RelatedClass> &classes,
                            CodeMarker *marker);
 
+ protected:
+    void appendSortedQmlNames(Text& text,
+                              const Node* base,
+                              const NodeList& subs,
+                              CodeMarker *marker);
+
+ private:
     QString amp;
     QString lt;
     QString gt;
diff --git a/tools/qdoc3/helpprojectwriter.cpp b/tools/qdoc3/helpprojectwriter.cpp
index 2189e02..71810e4 100644
--- a/tools/qdoc3/helpprojectwriter.cpp
+++ b/tools/qdoc3/helpprojectwriter.cpp
@@ -39,7 +39,6 @@
 **
 ****************************************************************************/
 
-#include <QtXml>
 #include <QHash>
 #include <QMap>
 
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index e767460..411a886 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -73,6 +73,7 @@ QString HtmlGenerator::sinceTitles[] =
         "    New Typedefs",
         "    New Properties",
         "    New Variables",
+        "    New QML Elements",
         "    New Qml Properties",
         "    New Qml Signals",
         "    New Qml Methods",
@@ -687,6 +688,8 @@ int HtmlGenerator::generateAtom(const Atom *atom,
             nsmap = newSinceMaps.find(atom->string());
             NewClassMaps::const_iterator ncmap;
             ncmap = newClassMaps.find(atom->string());
+            NewClassMaps::const_iterator nqcmap;
+            nqcmap = newQmlClassMaps.find(atom->string());
             if ((nsmap != newSinceMaps.constEnd()) && !nsmap.value().isEmpty()) {
                 QList<Section> sections;
                 QList<Section>::ConstIterator s;
@@ -697,6 +700,13 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                 while (n != nsmap.value().constEnd()) {
                     const Node* node = n.value();
                     switch (node->type()) {
+                      case Node::Fake:
+                          if (node->subType() == Node::QmlClass) {
+                              sections[QmlClass].appendMember((Node*)node);
+                              //qDebug() << "HtmlGenerator::generateAtom(): Atom::SinceList, append"
+                              //         << node->name();
+                          }
+                          break;
                       case Node::Namespace:
                           sections[Namespace].appendMember((Node*)node);
                           break;
@@ -782,6 +792,8 @@ int HtmlGenerator::generateAtom(const Atom *atom,
                         out() << "<h3>" << protectEnc((*s).name) << "</h3>\n";
                         if (idx == Class)
                             generateCompactList(0, marker, ncmap.value(), QString("Q"));
+                        else if (idx == QmlClass)
+                            generateCompactList(0, marker, nqcmap.value(), QString("Q"));
                         else if (idx == MemberFunction) {
                             ParentMaps parentmaps;
                             ParentMaps::iterator pmap;
@@ -2332,7 +2344,11 @@ void HtmlGenerator::generateCompactList(const Node *relative,
                     out() << "<a href=\""
                         << linkForNode(it.value(), relative)
                         << "\">";
-                    QStringList pieces = fullName(it.value(), relative, marker).split("::");
+                    QStringList pieces;
+                    if (it.value()->subType() == Node::QmlClass)
+                        pieces << it.value()->name();
+                    else
+                        pieces = fullName(it.value(), relative, marker).split("::");
                     out() << protectEnc(pieces.last());
                     out() << "</a>";
                     if (pieces.size() > 1) {
@@ -3723,6 +3739,9 @@ void HtmlGenerator::findAllSince(const InnerNode *node)
             NewClassMaps::iterator ncmap = newClassMaps.find(sinceVersion);
             if (ncmap == newClassMaps.end())
                 ncmap = newClassMaps.insert(sinceVersion,NodeMap());
+            NewClassMaps::iterator nqcmap = newQmlClassMaps.find(sinceVersion);
+            if (nqcmap == newQmlClassMaps.end())
+                nqcmap = newQmlClassMaps.insert(sinceVersion,NodeMap());
  
             if ((*child)->type() == Node::Function) {
                 FunctionNode *func = static_cast<FunctionNode *>(*child);
@@ -3742,6 +3761,16 @@ void HtmlGenerator::findAllSince(const InnerNode *node)
                     nsmap.value().insert(className,(*child));
                     ncmap.value().insert(className,(*child));
                 }
+                else if ((*child)->subType() == Node::QmlClass) {
+                    QString className = (*child)->name();
+                    if ((*child)->parent() &&
+                        (*child)->parent()->type() == Node::Namespace &&
+                        !(*child)->parent()->name().isEmpty())
+                        className = (*child)->parent()->name()+"::"+className;
+                    nsmap.value().insert(className,(*child));
+                    nqcmap.value().insert(className,(*child));
+                    //qDebug() << "findAllSince(): insert" << className << sinceVersion;
+                }
             }
             else {
                 QString name = (*child)->name();
@@ -4316,40 +4345,15 @@ void HtmlGenerator::generateQmlInheritedBy(const QmlClassNode* cn,
                                            CodeMarker* marker)
 {
     if (cn) {
-        QStringList subs;
+        NodeList subs;
         QmlClassNode::subclasses(cn->name(),subs);
         if (!subs.isEmpty()) {
-            subs.sort();
             Text text;
             text << Atom::ParaLeft << "Inherited by ";
-            for (int i = 0; i < subs.size(); ++i) {
-                text << subs.at(i);
-                text << separator(i, subs.size());
-            }
+            appendSortedQmlNames(text,cn,subs,marker);
             text << Atom::ParaRight;
             generateText(text, cn, marker);
         }
-#if 0        
-        if (cn->links().contains(Node::InheritsLink)) {
-            QPair<QString,QString> linkPair;
-            linkPair = cn->links()[Node::InheritsLink];
-            QStringList strList(linkPair.first);
-            const Node* n = myTree->findNode(strList,Node::Fake);
-            if (n && n->subType() == Node::QmlClass) {
-                const QmlClassNode* qcn = static_cast<const QmlClassNode*>(n);
-                out() << "<p style=\"text-align: center\">";
-                Text text;
-                text << "[Inherits ";
-                text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
-                text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK);
-                text << Atom(Atom::String, linkPair.second);
-                text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK);
-                text << "]";
-                generateText(text, cn, marker);
-                out() << "</p>";
-            }
-        }
-#endif        
     }
 }
 
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index 551bead..8fe0331 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -90,6 +90,7 @@ class HtmlGenerator : public PageGenerator
         Typedef, 
         Property,
         Variable, 
+        QmlClass,
         QmlProperty,
         QmlSignal,
         QmlMethod,
@@ -326,6 +327,7 @@ class HtmlGenerator : public PageGenerator
     NewSinceMaps newSinceMaps;
     static QString sinceTitles[];
     NewClassMaps newClassMaps;
+    NewClassMaps newQmlClassMaps;
     static int id;
 };
 
diff --git a/tools/qdoc3/jambiapiparser.cpp b/tools/qdoc3/jambiapiparser.cpp
index 3aba1b0..23f2716 100644
--- a/tools/qdoc3/jambiapiparser.cpp
+++ b/tools/qdoc3/jambiapiparser.cpp
@@ -43,8 +43,6 @@
     jambiapiparser.cpp
 */
 
-#include <QtXml>
-
 #include "cppcodeparser.h"
 #include "jambiapiparser.h"
 #include "node.h"
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp
index 57823fb..ea843ba 100644
--- a/tools/qdoc3/main.cpp
+++ b/tools/qdoc3/main.cpp
@@ -44,7 +44,6 @@
 */
 
 #include <qglobal.h>
-#include <QtCore>
 #include <stdlib.h>
 #include "apigenerator.h"
 #include "codemarker.h"
@@ -72,6 +71,11 @@
 #include "tokenizer.h"
 #include "tree.h"
 
+#include "qtranslator.h"
+#ifndef QT_BOOTSTRAPPED
+#  include "qcoreapplication.h"
+#endif
+
 QT_BEGIN_NAMESPACE
 
 /*
@@ -151,7 +155,9 @@ static void printVersion()
  */
 static void processQdocconfFile(const QString &fileName)
 {
+#ifndef QT_NO_TRANSLATION
     QList<QTranslator *> translators;
+#endif
 
     /*
       The Config instance represents the configuration data for qdoc.
@@ -207,6 +213,7 @@ static void processQdocconfFile(const QString &fileName)
     CodeParser::initialize(config);
     Generator::initialize(config);
 
+#ifndef QT_NO_TRANSLATION
     /*
       Load the language translators, if the configuration specifies any.
      */
@@ -221,6 +228,7 @@ static void processQdocconfFile(const QString &fileName)
 	translators.append(translator);
 	++fn;
     }
+#endif
 
     //QSet<QString> outputLanguages = config.getStringSet(CONFIG_OUTPUTLANGUAGES);
 
@@ -351,8 +359,9 @@ static void processQdocconfFile(const QString &fileName)
     Location::terminate();
     QDir::setCurrent(prevCurrentDir);
 
-    foreach (QTranslator *translator, translators)
-        delete translator;
+#ifndef QT_NO_TRANSLATION
+    qDeleteAll(translators);
+#endif
     delete tree;
 }
 
@@ -362,7 +371,9 @@ int main(int argc, char **argv)
 {
     QT_USE_NAMESPACE
 
+#ifndef QT_BOOTSTRAPPED
     QCoreApplication app(argc, argv);
+#endif
     QString cf = "qsauncompress \1 \2";
     PolyArchiveExtractor qsaExtractor(QStringList() << "qsa",cf);
     cf = "tar -C \2 -xf \1";
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 4ddcfb1..d4e4196 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -43,8 +43,8 @@
   node.cpp
 */
 
-#include <QtCore>
 #include "node.h"
+#include <qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -1161,7 +1161,8 @@ QString FunctionNode::signature(bool values) const
  */
 void FunctionNode::debug() const
 {
-    qDebug() << "QML METHOD" << name() << "rt" << rt << "pp" << pp;
+    qDebug("QML METHOD %s rt %s pp %s",
+            qPrintable(name()), qPrintable(rt), qPrintable(pp.join(" ")));
 }
 
 /*!
@@ -1257,7 +1258,7 @@ bool TargetNode::isInnerNode() const
 
 #ifdef QDOC_QML
 bool QmlClassNode::qmlOnly = false;
-QMultiMap<QString,QString> QmlClassNode::inheritedBy;
+QMultiMap<QString,Node*> QmlClassNode::inheritedBy;
 
 /*!
   Constructs a Qml class node (i.e. a Fake node with the
@@ -1275,6 +1276,23 @@ QmlClassNode::QmlClassNode(InnerNode *parent,
 }
 
 /*!
+  I made this so I could print a debug message here.
+ */
+QmlClassNode::~QmlClassNode()
+{
+    qDebug() << "Deleting QmlClassNode:" << name();
+}
+
+/*!
+  Clear the multimap so that subsequent runs don't try to use
+  nodes from a previous run.
+ */
+void QmlClassNode::clear()
+{
+    inheritedBy.clear();
+}
+
+/*!
   The base file name for this kind of node has "qml_"
   prepended to it.
 
@@ -1294,19 +1312,23 @@ QString QmlClassNode::fileBase() const
   Record the fact that QML class \a base is inherited by
   QML class \a sub.
  */
-void QmlClassNode::addInheritedBy(const QString& base, const QString& sub)
+void QmlClassNode::addInheritedBy(const QString& base, Node* sub)
 {
     inheritedBy.insert(base,sub);
+    qDebug() << "QmlClassNode::addInheritedBy(): insert" << base << sub->name() << inheritedBy.size();
 }
 
 /*!
-  Loads the list \a subs with the names of all the subclasses of \a base.
+  Loads the list \a subs with the nodes of all the subclasses of \a base.
  */
-void QmlClassNode::subclasses(const QString& base, QStringList& subs)
+void QmlClassNode::subclasses(const QString& base, NodeList& subs)
 {
     subs.clear();
-    if (inheritedBy.contains(base))
+    if (inheritedBy.count(base) > 0) {
         subs = inheritedBy.values(base);
+        qDebug() << "QmlClassNode::subclasses():" <<  inheritedBy.count(base) << base
+                 << "subs:" << subs.size() << "total size:" << inheritedBy.size();
+    }
 }
 
 /*!
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index de26025..1017813 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -379,16 +379,17 @@ class QmlClassNode : public FakeNode
     QmlClassNode(InnerNode *parent, 
                  const QString& name, 
                  const ClassNode* cn);
-    virtual ~QmlClassNode() { }
+    virtual ~QmlClassNode();
 
     const ClassNode* classNode() const { return cnode; }
     virtual QString fileBase() const;
-    static void addInheritedBy(const QString& base, const QString& sub);
-    static void subclasses(const QString& base, QStringList& subs);
+    static void addInheritedBy(const QString& base, Node* sub);
+    static void subclasses(const QString& base, NodeList& subs);
+    static void clear();
 
  public:
     static bool qmlOnly;
-    static QMultiMap<QString,QString> inheritedBy;
+    static QMultiMap<QString,Node*> inheritedBy;
 
  private:
     const ClassNode*    cnode;
diff --git a/tools/qdoc3/pagegenerator.cpp b/tools/qdoc3/pagegenerator.cpp
index 2cad9ed..f0f14fe 100644
--- a/tools/qdoc3/pagegenerator.cpp
+++ b/tools/qdoc3/pagegenerator.cpp
@@ -43,7 +43,6 @@
   pagegenerator.cpp
 */
 
-#include <QtCore>
 #include <qfile.h>
 #include <qfileinfo.h>
 
@@ -212,7 +211,7 @@ void PageGenerator::generateInnerNode(const InnerNode *node,
 #endif            
         if (fakeNode->subType() == Node::Page) {
             if (node->count() > 0)
-                qDebug() << "PAGE" << fakeNode->title() << "HAS CHILDREN";
+                qDebug("PAGE %s HAS CHILDREN", qPrintable(fakeNode->title()));
         }
     }
 
diff --git a/tools/qdoc3/qdoc3.pro b/tools/qdoc3/qdoc3.pro
index 7705692..e394799 100644
--- a/tools/qdoc3/qdoc3.pro
+++ b/tools/qdoc3/qdoc3.pro
@@ -4,9 +4,16 @@ DEFINES += QT_NO_CAST_TO_ASCII
 #DEFINES += QT_USE_FAST_OPERATOR_PLUS
 #DEFINES += QT_USE_FAST_CONCATENATION
 
-QT = core xml
-CONFIG += console
-CONFIG -= debug_and_release_target
+qdoc_bootstrapped {
+    include(../../src/tools/bootstrap/bootstrap.pri)
+    DEFINES -= QT_NO_CAST_FROM_ASCII
+    DEFINES += QT_NO_TRANSLATION
+} else {
+    QT = core xml
+    CONFIG += console
+    CONFIG -= debug_and_release_target
+}
+
 !isEmpty(QT_BUILD_TREE):DESTDIR = $$QT_BUILD_TREE/bin
 #CONFIG += debug
 build_all:!build_pass {
@@ -14,7 +21,8 @@ build_all:!build_pass {
     CONFIG += release
 #    CONFIG += debug
 }
-mac:CONFIG -= app_bundle
+
+CONFIG -= app_bundle
 HEADERS += apigenerator.h \
            archiveextractor.h \
 	   atom.h \
diff --git a/tools/qdoc3/test/qml.qdocconf b/tools/qdoc3/test/qdeclarative.qdocconf
index 3b5d8dc..e5b883a 100644
--- a/tools/qdoc3/test/qml.qdocconf
+++ b/tools/qdoc3/test/qdeclarative.qdocconf
@@ -6,7 +6,7 @@ include(qt-defines.qdocconf)
 
 project                 = Qml
 description             = Qml Reference Documentation
-url                     = http://doc.qtsoftware.com/4.6
+url                     = http://qt.nokia.com/doc/4.6/
 qmlonly                 = true
 
 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
diff --git a/tools/qdoc3/tree.cpp b/tools/qdoc3/tree.cpp
index 6c2502d..922c23e 100644
--- a/tools/qdoc3/tree.cpp
+++ b/tools/qdoc3/tree.cpp
@@ -43,7 +43,6 @@
   tree.cpp
 */
 
-#include <QtCore>
 #include <QDomDocument>
 
 #include "atom.h"
@@ -54,6 +53,8 @@
 #include "text.h"
 #include "tree.h"
 
+#include <limits.h>
+
 QT_BEGIN_NAMESPACE
 
 struct InheritanceBound
diff --git a/tools/qdoc3/webxmlgenerator.cpp b/tools/qdoc3/webxmlgenerator.cpp
index 205bc8c..6020b1b 100644
--- a/tools/qdoc3/webxmlgenerator.cpp
+++ b/tools/qdoc3/webxmlgenerator.cpp
@@ -43,8 +43,6 @@
   webxmlgenerator.cpp
 */
 
-#include <QtXml>
-
 #include "codemarker.h"
 #include "pagegenerator.h"
 #include "webxmlgenerator.h"
@@ -52,6 +50,8 @@
 #include "separator.h"
 #include "tree.h"
 
+#include <QtCore/qxmlstream.h>
+
 QT_BEGIN_NAMESPACE
 
 #define COMMAND_VERSION                 Doc::alias("version")
diff --git a/tools/qdoc3/webxmlgenerator.h b/tools/qdoc3/webxmlgenerator.h
index cadf176..071896a 100644
--- a/tools/qdoc3/webxmlgenerator.h
+++ b/tools/qdoc3/webxmlgenerator.h
@@ -46,12 +46,17 @@
 #ifndef WEBXMLGENERATOR_H
 #define WEBXMLGENERATOR_H
 
+#include <QtCore/qxmlstream.h>
+
 #include "codemarker.h"
 #include "config.h"
 #include "pagegenerator.h"
 
 QT_BEGIN_NAMESPACE
 
+class QXmlStreamReader;
+class QXmlStreamWriter;
+
 class WebXMLGenerator : public PageGenerator
 {
 public:
diff --git a/tools/qev/qev.pro b/tools/qev/qev.pro
index 28383c6..962b9fa 100644
--- a/tools/qev/qev.pro
+++ b/tools/qev/qev.pro
@@ -9,5 +9,3 @@ INCLUDEPATH += .
 # Input
 SOURCES += qev.cpp
 CONFIG += qt warn_on create_prl link_prl
-OBJECTS_DIR=.obj/debug-shared
-MOC_DIR=.moc/debug-shared
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 9ef02ac..a4de339 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -311,8 +311,11 @@ int main(int argc, char ** argv)
         usage();
     }
 
+    viewer.addLibraryPath(QCoreApplication::applicationDirPath());
+
     foreach (QString lib, libraries)
         viewer.addLibraryPath(lib);
+
     viewer.setNetworkCacheSize(cache);
     viewer.setRecordFile(recordfile);
     if (resizeview)
@@ -324,7 +327,7 @@ int main(int argc, char ** argv)
     if (!skin.isEmpty()) {
         if (skin == "list") {
             foreach (QString s, viewer.builtinSkins())
-                qWarning(s.toUtf8());
+                qWarning() << qPrintable(s);
             exit(0);
         } else {
             viewer.setSkin(skin);
diff --git a/tools/qml/qfxtester.h b/tools/qml/qfxtester.h
index 1a9f077..6521409 100644
--- a/tools/qml/qfxtester.h
+++ b/tools/qml/qfxtester.h
@@ -54,12 +54,12 @@ QT_BEGIN_NAMESPACE
 class QDeclarativeVisualTest : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QList<QObject *>* events READ events CONSTANT)
+    Q_PROPERTY(QDeclarativeListProperty<QObject> events READ events CONSTANT)
     Q_CLASSINFO("DefaultProperty", "events")
 public:
     QDeclarativeVisualTest() {}
 
-    QList<QObject *> *events() { return &m_events; }
+    QDeclarativeListProperty<QObject> events() { return QDeclarativeListProperty<QObject>(this, m_events); }
 
     int count() const { return m_events.count(); }
     QObject *event(int idx) { return m_events.at(idx); }
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index 9c9c398..9b68dbc 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -41,9 +41,11 @@ INSTALLS += target
 wince* {
 QT += scripttools \
     xml \
-    xmlpatterns \
     phonon
 
+    contains(QT_CONFIG, xmlpatterns) {
+        QT += xmlpatterns
+    }
     contains(QT_CONFIG, webkit) {
         QT += webkit 
     }
diff --git a/tools/qtestlib/wince/cetest/cetest.pro b/tools/qtestlib/wince/cetest/cetest.pro
index 6b6b02a..2773fe4 100644
--- a/tools/qtestlib/wince/cetest/cetest.pro
+++ b/tools/qtestlib/wince/cetest/cetest.pro
@@ -18,10 +18,13 @@ DEFINES        += QT_BUILD_QMAKE QT_BOOTSTRAPPED QT_NO_CODECS QT_LITE_UNICODE QT
 INCLUDEPATH = \
               $$QT_SOURCE_TREE/tools/qtestlib/ce/cetest \
               $$QT_SOURCE_TREE/qmake \
-              $$QT_SOURCE_TREE/tools/shared \
+              $$QT_SOURCE_TREE/qmake/generators/symbian \
+			  $$QT_SOURCE_TREE/tools/shared \
               $$QT_BUILD_TREE/include \
               $$QT_BUILD_TREE/include/QtCore \
               $$QT_BUILD_TREE/src/corelib/global
+			  
+VPATH += $$QT_SOURCE_TREE/tools/shared
 
 DEPENDPATH += $$QT_BUILD_TREE/src/corelib/tools $$QT_BUILD_TREE/src/corelib/io
 
@@ -33,6 +36,8 @@ HEADERS += \
 SOURCES += \
         remoteconnection.cpp \
         deployment.cpp \
+        symbian/epocroot.cpp \
+		windows/registry.cpp \
         main.cpp
 
 LIBS += ole32.lib advapi32.lib