Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7

165 files changed, 3540 insertions, 1840 deletions

diff --git a/configure b/configure
index 0dbf98f..30bc564 100755
--- a/configure
+++ b/configure
@@ -2315,6 +2315,17 @@ if [ "$OPT_SHADOW" = "yes" ]; then
         chmod 755 "$outpath/bin/syncqt"
     fi
 
+    for i in createpackage patch_capabilities; do
+        rm -f "$outpath/bin/$i"
+        if [ -x "$relpath/bin/$i" ]; then
+            mkdir -p "$outpath/bin"
+            echo "#!/bin/sh" >"$outpath/bin/$i"
+            echo "QTDIR=\"$relpath\"; export QTDIR" >>"$outpath/bin/$i"
+            echo "\"$relpath/bin/$i\" \"\$@\"" >>"$outpath/bin/$i"
+            chmod 755 "$outpath/bin/$i"
+        fi
+    done
+
     # symlink the mkspecs directory
     mkdir -p "$outpath/mkspecs"
     rm -f "$outpath"/mkspecs/*
diff --git a/doc/src/internationalization/linguist-manual.qdoc b/doc/src/internationalization/linguist-manual.qdoc
index 678eb09..424dec2 100644
--- a/doc/src/internationalization/linguist-manual.qdoc
+++ b/doc/src/internationalization/linguist-manual.qdoc
@@ -724,7 +724,7 @@
     causes an application to perform an action. There are two kinds of
     keyboard accelerators: Alt key and Ctrl key accelerators.
 
-    \section3 Alt Key Accellerators
+    \section3 Alt Key Accelerators
 
     Alt key accelerators are used in menu selection and on buttons.
     The underlined character in a menu item or button label signifies
diff --git a/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp b/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp
index 94a9f68..2867bd5a 100644
--- a/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp
+++ b/doc/src/snippets/code/src.qdbus.qdbuspendingcall.cpp
@@ -61,5 +61,6 @@ void MyClass::callFinishedSlot(QDBusPendingCallWatcher *call)
         QByteArray data = reply.argumentAt<1>();
         showReply(text, data);
     }
+    call->deleteLater();
 }
 //! [1]
diff --git a/examples/network/qftp/sym_iap_util.h b/examples/network/qftp/sym_iap_util.h
index 445036a..f23d82f 100644
--- a/examples/network/qftp/sym_iap_util.h
+++ b/examples/network/qftp/sym_iap_util.h
@@ -60,7 +60,7 @@
 //#include <QTextCodec>
 
 _LIT(KIapNameSetting, "IAP\\Name");             // text - mandatory
-_LIT(KIapTableIdField, "IAP\Id");
+_LIT(KIapTableIdField, "IAP\\Id");
 _LIT(KIapDialogPref, "IAP\\DialogPref");        // TUnit32 - optional
 _LIT(KIapService, "IAP\\IAPService");           // TUnit32 - mandatory
 _LIT(KIapServiceType, "IAP\\IAPServiceType");   // text - mandatory
diff --git a/examples/qtconcurrent/map/main.cpp b/examples/qtconcurrent/map/main.cpp
index 6068d30..6afefca 100644
--- a/examples/qtconcurrent/map/main.cpp
+++ b/examples/qtconcurrent/map/main.cpp
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
 
     // Use QtConcurrentBlocking::mapped to apply the scale function to all the
     // images in the list.
-    QList<QImage> thumbnails = QtConcurrent::blockingMapped(images, scale);
+    QList<QImage> thumbnails = QtConcurrent::blockingMapped<QList<QImage> >(images, scale);
 
     return 0;
 }
diff --git a/mkspecs/features/resources.prf b/mkspecs/features/resources.prf
index 8ccd576..eb33aab 100644
--- a/mkspecs/features/resources.prf
+++ b/mkspecs/features/resources.prf
@@ -1,6 +1,6 @@
 isEmpty(QMAKE_RCC) {
-    win32:QMAKE_RCC = $$[QT_INSTALL_BINS]\rcc.exe
-    else:QMAKE_RCC = $$[QT_INSTALL_BINS]/rcc
+    win32:QMAKE_RCC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}rcc.exe
+    else:QMAKE_RCC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}rcc
 }
 
 isEmpty(RCC_DIR):RCC_DIR = .
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf
index ef03b0a..a097771 100644
--- a/mkspecs/features/symbian/symbian_building.prf
+++ b/mkspecs/features/symbian/symbian_building.prf
@@ -45,15 +45,6 @@ for(libraries, QMAKE_LIBS) {
 }
 QMAKE_LIBS = $$newLIBS
 
-linux-gcce {
-    QMAKE_LIBS	+= -l:usrt2_2.lib \
-                   -l:dfpaeabi.dso \
-                   -l:drtaeabi.dso \
-                   -l:scppnwdl.dso \
-                   -lsupc++ \
-                   -lgcc
-}
-
 elf2e32_LIBPATH =
 for(libPath, QMAKE_LIBDIR) {
     elf2e32_LIBPATH += "--libpath=$$libPath"
@@ -131,7 +122,14 @@ contains(TEMPLATE, lib):!contains(CONFIG, static):!contains(CONFIG, staticlib) {
     linux-armcc: {
         QMAKE_LIBS += -ledllstub.lib -ledll.lib\\(uc_dll_.o\\)
     } else :linux-gcce {
-        #QMAKE_LIBS += -l:edllstub.lib -l:edll.lib
+        QMAKE_LIBS += \
+            -l:edll.lib \
+            -l:usrt2_2.lib \
+            -l:dfpaeabi.dso \
+            -l:drtaeabi.dso \
+            -l:scppnwdl.dso \
+            -lsupc++ \
+            -lgcc
     }
 
     QMAKE_LFLAGS += --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].dll
@@ -162,12 +160,31 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@.*") {
 
     linux-armcc: {
         QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\)
+        contains(CONFIG, "qt"):contains(QT, "core") { #if linking with QtCore
+            QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib
+        } else {
+            QMAKE_LIBS += -llibcrt0.lib
+        }
     } else :linux-gcce {
-        #QMAKE_LIBS += -l:eexe.lib
+        # notice that we can't merge these as ordering of arguments is important.
+        QMAKE_LIBS += \
+            -l:eexe.lib \
+            -l:usrt2_2.lib
+        contains(CONFIG, "qt"):contains(QT, "core") { #if linking with QtCore
+            QMAKE_LIBS += -l:qtmain$${QT_LIBINFIX}.lib
+        } else {
+            QMAKE_LIBS += -l:libcrt0_gcce.lib
+        }
+        QMAKE_LIBS += \
+            -l:dfpaeabi.dso \
+            -l:drtaeabi.dso \
+            -l:scppnwdl.dso \
+            -lsupc++ \
+            -lgcc
+        QMAKE_LFLAGS += --shared
     }
 
     QMAKE_LFLAGS += --soname $${TARGET}\\{$${hexVersion}\\}\\[$${intUid3}\\].exe
-# TODO gcce added --shared here...
     DEFINES += __EXE__
 }
 
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf
index eaf373a..8ebe0ea 100644
--- a/mkspecs/features/uic.prf
+++ b/mkspecs/features/uic.prf
@@ -1,11 +1,11 @@
 
 isEmpty(QMAKE_UIC3) {
-    contains(QMAKE_HOST.os,Windows):QMAKE_UIC3 = $$[QT_INSTALL_BINS]\uic3.exe
+    contains(QMAKE_HOST.os,Windows):QMAKE_UIC3 = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic3.exe
     else:QMAKE_UIC3 = $$[QT_INSTALL_BINS]/uic3
 }
 
 isEmpty(QMAKE_UIC) {
-   contains(QMAKE_HOST.os,Windows):QMAKE_UIC = $$[QT_INSTALL_BINS]\uic.exe
+   contains(QMAKE_HOST.os,Windows):QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
    else:QMAKE_UIC = $$[QT_INSTALL_BINS]/uic
 }
 
diff --git a/mkspecs/symbian/linux-gcce/qmake.conf b/mkspecs/symbian/linux-gcce/qmake.conf
index de3791c..c75e46e 100644
--- a/mkspecs/symbian/linux-gcce/qmake.conf
+++ b/mkspecs/symbian/linux-gcce/qmake.conf
@@ -53,17 +53,20 @@ DEFINES		+= __GCCE__ \
                    UNICODE \
                    _STLP_NO_EXCEPTION_HEADER
 
-QMAKE_LFLAGS_APP        += --entry _E32Startup
+QMAKE_LFLAGS_APP        += --entry=_E32Startup -u _E32Startup
 QMAKE_LFLAGS_SHLIB      += --default-symver --entry _E32Dll
 QMAKE_LFLAGS_PLUGIN     += $$QMAKE_LFLAGS_SHLIB
 
-gcceExtraFlags = --include=${EPOCROOT}epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -fvisibility-inlines-hidden -msoft-float -T script
+gcceExtraFlags = --include=${EPOCROOT}/epoc32/include/gcce/gcce.h -march=armv5t -mapcs -mthumb-interwork -nostdinc -c -msoft-float -T script
 QMAKE_CFLAGS += $${gcceExtraFlags}
-QMAKE_CXXFLAGS += $${gcceExtraFlags} -x c++ -fexceptions -fno-unit-at-a-time
+QMAKE_CXXFLAGS += $${gcceExtraFlags} -x c++ -fexceptions -fno-unit-at-a-time -fvisibility-inlines-hidden
+#If we are not going to link to Qt or qtmain.lib, we need to include this at least once.
+isEmpty(QT):contains(TEMPLATE, app) {
+    QMAKE_CXXFLAGS += --include=${EPOCROOT}/epoc32/include/stdapis/staticlibinit_gcce.h
+}
 
 QMAKE_LFLAGS += --target1-abs \
                 --no-undefined \
-                --strip-debug \
                 --nostdlib
 
 QMAKE_LIBDIR	+= ${EPOCROOT}/epoc32/release/armv5/udeb/
diff --git a/qmake/generators/metamakefile.cpp b/qmake/generators/metamakefile.cpp
index e76e596..c42a837 100644
--- a/qmake/generators/metamakefile.cpp
+++ b/qmake/generators/metamakefile.cpp
@@ -58,6 +58,8 @@ MetaMakefileGenerator::~MetaMakefileGenerator()
         delete project;
 }
 
+#ifndef QT_QMAKE_PARSER_ONLY
+
 class BuildsMetaMakefileGenerator : public MetaMakefileGenerator
 {
 private:
@@ -489,6 +491,25 @@ MetaMakefileGenerator::createMakefileGenerator(QMakeProject *proj, bool noIO)
     return mkfile;
 }
 
+MetaMakefileGenerator *
+MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &name, bool op, bool *success)
+{
+    MetaMakefileGenerator *ret = 0;
+    if ((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
+         Option::qmake_mode == Option::QMAKE_GENERATE_PRL)) {
+        if (proj->first("TEMPLATE").endsWith("subdirs"))
+            ret = new SubdirsMetaMakefileGenerator(proj, name, op);
+    }
+    if (!ret)
+        ret = new BuildsMetaMakefileGenerator(proj, name, op);
+    bool res = ret->init();
+    if (success)
+        *success = res;
+    return ret;
+}
+
+#endif // QT_QMAKE_PARSER_ONLY
+
 bool
 MetaMakefileGenerator::modesForGenerator(const QString &gen,
         Option::HOST_MODE *host_mode, Option::TARG_MODE *target_mode)
@@ -523,21 +544,4 @@ MetaMakefileGenerator::modesForGenerator(const QString &gen,
     return true;
 }
 
-MetaMakefileGenerator *
-MetaMakefileGenerator::createMetaGenerator(QMakeProject *proj, const QString &name, bool op, bool *success)
-{
-    MetaMakefileGenerator *ret = 0;
-    if ((Option::qmake_mode == Option::QMAKE_GENERATE_MAKEFILE ||
-         Option::qmake_mode == Option::QMAKE_GENERATE_PRL)) {
-        if (proj->first("TEMPLATE").endsWith("subdirs"))
-            ret = new SubdirsMetaMakefileGenerator(proj, name, op);
-    }
-    if (!ret)
-        ret = new BuildsMetaMakefileGenerator(proj, name, op);
-    bool res = ret->init();
-    if (success)
-        *success = res;
-    return ret;
-}
-
 QT_END_NAMESPACE
diff --git a/qmake/project.cpp b/qmake/project.cpp
index 01a3843..764264f 100644
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1507,7 +1507,6 @@ QMakeProject::read(uchar cmd)
 
 void QMakeProject::validateModes()
 {
-#if !defined(QT_BUILD_QMAKE_NO_GENERATORS)
     if (Option::host_mode == Option::HOST_UNKNOWN_MODE
         || Option::target_mode == Option::TARG_UNKNOWN_MODE) {
         Option::HOST_MODE host_mode;
@@ -1544,7 +1543,6 @@ void QMakeProject::validateModes()
             }
         }
     }
-#endif // !defined(QT_BUILD_QMAKE_NO_GENERATORS)
 }
 
 bool
@@ -3148,6 +3146,21 @@ QStringList &QMakeProject::values(const QString &_var, QMap<QString, QStringList
         if (place[var].isEmpty())
             place[var] = QStringList(epocRoot());
     }
+#if defined(Q_OS_WIN32) && defined(Q_CC_MSVC)
+      else if(var.startsWith(QLatin1String("QMAKE_TARGET."))) {
+            QString ret, type = var.mid(13);
+            if(type == "arch") {
+                QString paths = qgetenv("PATH");
+                QString vcBin64 = qgetenv("VCINSTALLDIR").append("\\bin\\amd64");
+                QString vcBinX86_64 = qgetenv("VCINSTALLDIR").append("\\bin\\x86_amd64");
+                if(paths.contains(vcBin64,Qt::CaseInsensitive) || paths.contains(vcBinX86_64,Qt::CaseInsensitive))
+                    ret = "x86_64";
+                else
+                    ret = "x86";
+            }
+            place[var] = QStringList(ret);
+    }
+#endif
     //qDebug("REPLACE [%s]->[%s]", qPrintable(var), qPrintable(place[var].join("::")));
     return place[var];
 }
diff --git a/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp b/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp
index e932e70..a9d0694 100644
--- a/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp
+++ b/src/3rdparty/phonon/ds9/abstractvideorenderer.cpp
@@ -99,8 +99,8 @@ namespace Phonon
             m_dstX = m_dstY = 0;
 
             if (ratio > 0) {
-                if (realWidth / realHeight > ratio && scaleMode == Phonon::VideoWidget::FitInView
-                    || realWidth / realHeight < ratio && scaleMode == Phonon::VideoWidget::ScaleAndCrop) {
+                if ((realWidth / realHeight > ratio && scaleMode == Phonon::VideoWidget::FitInView)
+                    || (realWidth / realHeight < ratio && scaleMode == Phonon::VideoWidget::ScaleAndCrop)) {
                         //the height is correct, let's change the width
                         m_dstWidth = qRound(realHeight * ratio);
                         m_dstX = qRound((realWidth - realHeight * ratio) / 2.);
diff --git a/src/3rdparty/phonon/ds9/backend.cpp b/src/3rdparty/phonon/ds9/backend.cpp
index 2c56af7..fbc4bdc 100644
--- a/src/3rdparty/phonon/ds9/backend.cpp
+++ b/src/3rdparty/phonon/ds9/backend.cpp
@@ -41,6 +41,8 @@ namespace Phonon
 {
     namespace DS9
     {
+        QMutex *Backend::directShowMutex = 0;
+
         bool Backend::AudioMoniker::operator==(const AudioMoniker &other)
         {
             return other->IsEqual(*this) == S_OK;
@@ -50,6 +52,8 @@ namespace Phonon
         Backend::Backend(QObject *parent, const QVariantList &)
             : QObject(parent)
         {
+            directShowMutex = &m_directShowMutex;
+
             ::CoInitialize(0);
 
             //registering meta types
@@ -62,6 +66,8 @@ namespace Phonon
             m_audioOutputs.clear();
             m_audioEffects.clear();
             ::CoUninitialize();
+
+            directShowMutex = 0;
         }
 
         QObject *Backend::createObject(BackendInterface::Class c, QObject *parent, const QList<QVariant> &args)
@@ -131,6 +137,7 @@ namespace Phonon
 
         QList<int> Backend::objectDescriptionIndexes(Phonon::ObjectDescriptionType type) const
         {
+            QMutexLocker locker(&m_directShowMutex);
             QList<int> ret;
 
             switch(type)
@@ -157,7 +164,7 @@ namespace Phonon
                     while (S_OK == enumMon->Next(1, mon.pparam(), 0)) {
                         LPOLESTR str = 0;
                         mon->GetDisplayName(0,0,&str);
-                        const QString name = QString::fromUtf16((unsigned short*)str);
+                        const QString name = QString::fromWCharArray(str);
 						ComPointer<IMalloc> alloc;
 						::CoGetMalloc(1, alloc.pparam());
                         alloc->Free(str);
@@ -204,6 +211,7 @@ namespace Phonon
 
         QHash<QByteArray, QVariant> Backend::objectDescriptionProperties(Phonon::ObjectDescriptionType type, int index) const
         {
+            QMutexLocker locker(&m_directShowMutex);
             QHash<QByteArray, QVariant> ret;
             switch (type)
             {
@@ -216,7 +224,7 @@ namespace Phonon
                     LPOLESTR str = 0;
                     HRESULT hr = mon->GetDisplayName(0,0, &str);
                     if (SUCCEEDED(hr)) {
-                        QString name = QString::fromUtf16((unsigned short*)str);
+                        QString name = QString::fromWCharArray(str);
 						ComPointer<IMalloc> alloc;
 						::CoGetMalloc(1, alloc.pparam());
                         alloc->Free(str);
@@ -231,7 +239,7 @@ namespace Phonon
                     WCHAR name[80]; // 80 is clearly stated in the MSDN doc
                     HRESULT hr = ::DMOGetName(m_audioEffects[index], name);
                     if (SUCCEEDED(hr)) {
-                        ret["name"] = QString::fromUtf16((unsigned short*)name);
+                        ret["name"] = QString::fromWCharArray(name);
                     }
                 }
                 break;
diff --git a/src/3rdparty/phonon/ds9/backend.h b/src/3rdparty/phonon/ds9/backend.h
index ad638f2..7c3c109 100644
--- a/src/3rdparty/phonon/ds9/backend.h
+++ b/src/3rdparty/phonon/ds9/backend.h
@@ -23,6 +23,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #include <phonon/phononnamespace.h>
 
 #include <QtCore/QList>
+#include <QtCore/QMutex>
 
 #include "compointer.h"
 #include "backendnode.h"
@@ -63,6 +64,8 @@ namespace Phonon
 
             Filter getAudioOutputFilter(int index) const;
 
+            static QMutex *directShowMutex;
+
         Q_SIGNALS:
             void objectDescriptionChanged(ObjectDescriptionType);
 
@@ -74,6 +77,7 @@ namespace Phonon
             };
             mutable QVector<AudioMoniker> m_audioOutputs;
             mutable QVector<CLSID> m_audioEffects;
+            mutable QMutex m_directShowMutex;
         };
     }
 }
diff --git a/src/3rdparty/phonon/ds9/backendnode.cpp b/src/3rdparty/phonon/ds9/backendnode.cpp
index 7e0b3cd..737ab7b 100644
--- a/src/3rdparty/phonon/ds9/backendnode.cpp
+++ b/src/3rdparty/phonon/ds9/backendnode.cpp
@@ -57,6 +57,25 @@ namespace Phonon
 
         BackendNode::~BackendNode()
         {
+            //this will remove the filter from the graph
+            FILTER_INFO info;
+            for(int i = 0; i < FILTER_COUNT; ++i) {
+                const Filter &filter = m_filters[i];
+                if (!filter)
+                    continue;
+                filter->QueryFilterInfo(&info);
+                if (info.pGraph) {
+                    HRESULT hr = info.pGraph->RemoveFilter(filter);
+
+                    if (FAILED(hr) && m_mediaObject) {
+                        m_mediaObject->ensureStopped();
+
+                        hr = info.pGraph->RemoveFilter(filter);
+                    }
+                    Q_ASSERT(SUCCEEDED(hr));
+                    info.pGraph->Release();
+                }
+            }
         }
 
         void BackendNode::setMediaObject(MediaObject *mo)
diff --git a/src/3rdparty/phonon/ds9/ds9.desktop b/src/3rdparty/phonon/ds9/ds9.desktop
index 1bc3451..764390e 100644
--- a/src/3rdparty/phonon/ds9/ds9.desktop
+++ b/src/3rdparty/phonon/ds9/ds9.desktop
@@ -5,13 +5,12 @@ MimeType=application/x-annodex;video/quicktime;video/x-quicktime;audio/x-m4a;app
 X-KDE-Library=phonon_ds9
 X-KDE-PhononBackendInfo-InterfaceVersion=1
 X-KDE-PhononBackendInfo-Version=0.1
-X-KDE-PhononBackendInfo-Website=http://www.trolltech.com/
+X-KDE-PhononBackendInfo-Website=http://qt.nokia.com/
 InitialPreference=15
 
 Name=DirectShow9
 Name[bg]=DirectShow9
 Name[ca]=DirectShow9
-Name[ca@valencia]=DirectShow9
 Name[cs]=DirectShow9
 Name[da]=DirectShow9
 Name[de]=DirectShow9
@@ -20,14 +19,11 @@ Name[en_GB]=DirectShow9
 Name[es]=DirectShow9
 Name[et]=DirectShow9
 Name[eu]=DirectShow9
-Name[fi]=DirectShow9
 Name[fr]=DirectShow9
 Name[ga]=DirectShow9
 Name[gl]=DirectShow9
-Name[hr]=DirectShow9
 Name[hsb]=DirectShow9
 Name[hu]=DirectShow9
-Name[id]=DirectShow9
 Name[is]=DirectShow9
 Name[it]=DirectShow9
 Name[ja]=DirectShow9
@@ -35,7 +31,6 @@ Name[ko]=DirectShow9
 Name[ku]=DirectShow9
 Name[lt]=DirectShow9
 Name[lv]=DirectShow9
-Name[nb]=DirectShow9
 Name[nds]=DirectShow9
 Name[nl]=DirectShow9
 Name[nn]=DirectShow9
@@ -43,13 +38,10 @@ Name[pa]=ਡਾਇਰੈਕਸ਼ੋ9
 Name[pl]=DirectShow9
 Name[pt]=DirectShow9
 Name[pt_BR]=DirectShow9
-Name[ru]=DirectShow9
 Name[se]=DirectShow9
 Name[sk]=DirectShow 9
 Name[sl]=DirectShow 9
 Name[sr]=Директшоу‑9
-Name[sr@ijekavian]=Директшоу‑9
-Name[sr@ijekavianlatin]=DirectShow‑9
 Name[sr@latin]=DirectShow‑9
 Name[sv]=Directshow 9
 Name[tr]=DirectShow9
@@ -61,7 +53,6 @@ Name[zh_TW]=DirectShow9
 Comment=Phonon DirectShow9 backend
 Comment[bg]=Phonon DirectShow9
 Comment[ca]=Dorsal DirectShow9 del Phonon
-Comment[ca@valencia]=Dorsal DirectShow9 del Phonon
 Comment[cs]=Phonon DirectShow9 backend
 Comment[da]=DirectShow9-backend til Phonon
 Comment[de]=Phonon-Treiber für DirectShow9
@@ -70,13 +61,11 @@ Comment[en_GB]=Phonon DirectShow9 backend
 Comment[es]=Motor DirectShow9 para Phonon
 Comment[et]=Phononi DirectShow9 taustaprogramm
 Comment[eu]=Phonon DirectShow9 backend
-Comment[fi]=Phonon DirectShow9-taustaohjelma
 Comment[fr]=Système de gestion DirectShow9 pour Phonon 
 Comment[ga]=Inneall DirectShow9 le haghaidh Phonon
 Comment[gl]=Infraestrutura de DirectShow9 para Phonon
 Comment[hsb]=Phonon DirectShow9 backend
 Comment[hu]=Phonon DirectShow9 modul
-Comment[id]=Phonon DirectShow9 backend
 Comment[is]=Phonon DirectShow9 bakendi
 Comment[it]=Motore DirectShow9 di Phonon
 Comment[ja]=Phonon DirectShow9 バックエンド
@@ -84,7 +73,6 @@ Comment[ko]=Phonon DirectShow9 백엔드
 Comment[ku]=Binesaza Phonon DirectShow9
 Comment[lt]=Phonon DirectShow9 galinė sąsaja
 Comment[lv]=Phonon DirectShow9 aizmugure
-Comment[nb]=Phonon-motor for DirectShow9
 Comment[nds]=Phonon-Hülpprogrmm DirectShow9
 Comment[nl]=DirectShow9-backend (Phonon)
 Comment[nn]=Phonon-motor for DirectShow9
@@ -92,13 +80,10 @@ Comment[pa]=ਫੋਨੋਨ ਡਾਇਰੈਕਟਸ਼ੋ9 ਬੈਕਐਂਡ
 Comment[pl]=Obsługa DirectShow9 przez Phonon
 Comment[pt]=Infra-estrutura do DirectShow9 para o Phonon
 Comment[pt_BR]=Infraestrutura Phonon DirectShow9
-Comment[ru]=Механизм DirectShow9 для Phonon
 Comment[se]=Phonon DirectShow9 duogášmohtor
 Comment[sk]=Phonon DirectShow 9 podsystém
 Comment[sl]=Phononova Hrbtenica DirectShow 9
 Comment[sr]=Директшоу‑9 као позадина Фонона
-Comment[sr@ijekavian]=Директшоу‑9 као позадина Фонона
-Comment[sr@ijekavianlatin]=DirectShow‑9 kao pozadina Phonona
 Comment[sr@latin]=DirectShow‑9 kao pozadina Phonona
 Comment[sv]=Phonon Directshow 9-gränssnitt
 Comment[tr]=Phonon DirectShow9 arka ucu
diff --git a/src/3rdparty/phonon/ds9/effect.cpp b/src/3rdparty/phonon/ds9/effect.cpp
index 104a3c1..ebe976b 100644
--- a/src/3rdparty/phonon/ds9/effect.cpp
+++ b/src/3rdparty/phonon/ds9/effect.cpp
@@ -82,7 +82,7 @@ namespace Phonon
                         current += wcslen(current) + 1; //skip the name
                         current += wcslen(current) + 1; //skip the unit
                         for(; *current; current += wcslen(current) + 1) {
-                            values.append( QString::fromUtf16((unsigned short*)current) );
+                            values.append( QString::fromWCharArray(current) );
                         }
                     }
                     //FALLTHROUGH
@@ -107,7 +107,7 @@ namespace Phonon
                 Phonon::EffectParameter::Hints hint = info.mopCaps == MP_CAPS_CURVE_INVSQUARE ?
                     Phonon::EffectParameter::LogarithmicHint : Phonon::EffectParameter::Hints(0);
 
-                const QString n = QString::fromUtf16((unsigned short*)name);
+                const QString n = QString::fromWCharArray(name);
                 ret.append(Phonon::EffectParameter(i, n, hint, def, min, max, values));
                 ::CoTaskMemFree(name); //let's free the memory
             }
diff --git a/src/3rdparty/phonon/ds9/fakesource.cpp b/src/3rdparty/phonon/ds9/fakesource.cpp
index 9a61a2e..4dce138 100644
--- a/src/3rdparty/phonon/ds9/fakesource.cpp
+++ b/src/3rdparty/phonon/ds9/fakesource.cpp
@@ -29,8 +29,10 @@ namespace Phonon
     namespace DS9
     {
         static WAVEFORMATEX g_defaultWaveFormat = {WAVE_FORMAT_PCM, 2, 44100, 176400, 4, 16, 0};
-        static BITMAPINFOHEADER g_defautBitmapHeader = { sizeof(BITMAPINFOHEADER), 1, 1, 1, 0, 0, 0, 0, 0, 0, 0};
-        static VIDEOINFOHEADER2 g_defaultVideoInfo = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+        static VIDEOINFOHEADER2 g_defaultVideoInfo = { { 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0, 0, 0, 0, 0, 0, {0}, 0, {sizeof(BITMAPINFOHEADER), 1, 1, 1, 0, 0, 0, 0, 0, 0, 0} };
+
+        static const AM_MEDIA_TYPE g_fakeAudioType = {MEDIATYPE_Audio, MEDIASUBTYPE_PCM, 0, 0, 2, FORMAT_WaveFormatEx, 0, sizeof(WAVEFORMATEX), reinterpret_cast<BYTE*>(&g_defaultWaveFormat)};
+        static const AM_MEDIA_TYPE g_fakeVideoType = {MEDIATYPE_Video, MEDIASUBTYPE_RGB32, TRUE, FALSE, 0, FORMAT_VideoInfo2, 0, sizeof(VIDEOINFOHEADER2), reinterpret_cast<BYTE*>(&g_defaultVideoInfo)};
 
         class FakePin : public QPin
         {
@@ -128,36 +130,12 @@ namespace Phonon
 
         void FakeSource::createFakeAudioPin()
         {
-            AM_MEDIA_TYPE mt;
-            qMemSet(&mt, 0, sizeof(AM_MEDIA_TYPE));
-            mt.majortype = MEDIATYPE_Audio;
-            mt.subtype = MEDIASUBTYPE_PCM;
-            mt.formattype = FORMAT_WaveFormatEx;
-            mt.lSampleSize = 2;
-
-            //fake the format (stereo 44.1 khz stereo 16 bits)
-            mt.cbFormat = sizeof(WAVEFORMATEX);
-            mt.pbFormat = reinterpret_cast<BYTE*>(&g_defaultWaveFormat);
-
-            new FakePin(this, mt);
+            new FakePin(this, g_fakeAudioType);
         }
 
         void FakeSource::createFakeVideoPin()
         {
-            AM_MEDIA_TYPE mt;
-            qMemSet(&mt, 0, sizeof(AM_MEDIA_TYPE));
-            mt.majortype = MEDIATYPE_Video;
-            mt.subtype = MEDIASUBTYPE_RGB32;
-            mt.formattype = FORMAT_VideoInfo2;
-            mt.bFixedSizeSamples = 1;
-
-            g_defaultVideoInfo.bmiHeader = g_defautBitmapHeader;
-
-            //fake the format
-            mt.cbFormat = sizeof(VIDEOINFOHEADER2);
-            mt.pbFormat = reinterpret_cast<BYTE*>(&g_defaultVideoInfo);
-
-            new FakePin(this, mt);
+            new FakePin(this, g_fakeVideoType);
         }
 
     }
diff --git a/src/3rdparty/phonon/ds9/iodevicereader.cpp b/src/3rdparty/phonon/ds9/iodevicereader.cpp
index 9152712..ba4ae5c 100644
--- a/src/3rdparty/phonon/ds9/iodevicereader.cpp
+++ b/src/3rdparty/phonon/ds9/iodevicereader.cpp
@@ -36,18 +36,20 @@ namespace Phonon
         //these mediatypes define a stream, its type will be autodetected by DirectShow
         static QVector<AM_MEDIA_TYPE> getMediaTypes()
         {
-            AM_MEDIA_TYPE mt = { MEDIATYPE_Stream, MEDIASUBTYPE_NULL, TRUE, FALSE, 1, GUID_NULL, 0, 0, 0};
+            //the order here is important because otherwise,
+            //directshow might not be able to detect the stream type correctly
+
+            AM_MEDIA_TYPE mt = { MEDIATYPE_Stream, MEDIASUBTYPE_Avi, TRUE, FALSE, 1, GUID_NULL, 0, 0, 0};
 
             QVector<AM_MEDIA_TYPE> ret;
-            //normal auto-detect stream
-            mt.subtype = MEDIASUBTYPE_NULL;
-            ret << mt;
             //AVI stream
-            mt.subtype = MEDIASUBTYPE_Avi;
             ret << mt;
             //WAVE stream
             mt.subtype = MEDIASUBTYPE_WAVE;
             ret << mt;
+            //normal auto-detect stream (must be at the end!)
+            mt.subtype = MEDIASUBTYPE_NULL;
+            ret << mt;
             return ret;
         }
 
@@ -64,7 +66,6 @@ namespace Phonon
               //for Phonon::StreamInterface
               void writeData(const QByteArray &data)
               {
-                  QWriteLocker locker(&m_lock);
                   m_pos += data.size();
                   m_buffer += data;
               }
@@ -75,54 +76,22 @@ namespace Phonon
 
               void setStreamSize(qint64 newSize)
               {
-                  QWriteLocker locker(&m_lock);
+                  QMutexLocker locker(&m_mutex);
                   m_size = newSize;
               }
 
-              qint64 streamSize() const
-              {
-                  QReadLocker locker(&m_lock);
-                  return m_size;
-              }
-
               void setStreamSeekable(bool s)
               {
-                  QWriteLocker locker(&m_lock);
+                  QMutexLocker locker(&m_mutex);
                   m_seekable = s;
               }
 
-              bool streamSeekable() const
-              {
-                  QReadLocker locker(&m_lock);
-                  return m_seekable;
-              }
-
-              void setCurrentPos(qint64 pos)
-              {
-                  QWriteLocker locker(&m_lock);
-                  m_pos = pos;
-                  seekStream(pos);
-                  m_buffer.clear();
-              }
-
-              qint64 currentPos() const
-              {
-                  QReadLocker locker(&m_lock);
-                  return m_pos;
-              }
-
-              int currentBufferSize() const
-              {
-                  QReadLocker locker(&m_lock);
-                  return m_buffer.size();
-              }
-
               //virtual pure members
 
               //implementation from IAsyncReader
               STDMETHODIMP Length(LONGLONG *total, LONGLONG *available)
               {
-                  QReadLocker locker(&m_lock);
+                  QMutexLocker locker(&m_mutex);
                   if (total) {
                       *total = m_size;
                   }
@@ -137,37 +106,39 @@ namespace Phonon
 
               HRESULT read(LONGLONG pos, LONG length, BYTE *buffer, LONG *actual)
               {
-                  QMutexLocker locker(&m_mutexRead);
+                  Q_ASSERT(!m_mutex.tryLock());
+                  if (m_mediaGraph->isStopping()) {
+                      return VFW_E_WRONG_STATE;
+                  }
 
-                  if(streamSize() != 1 && pos + length > streamSize()) {
+                  if(m_size != 1 && pos + length > m_size) {
                       //it tries to read outside of the boundaries
                       return E_FAIL;
                   }
 
-                  if (currentPos() - currentBufferSize() != pos) {
-                      if (!streamSeekable()) {
+                  if (m_pos - m_buffer.size() != pos) {
+                      if (!m_seekable) {
                           return S_FALSE;
                       }
-                      setCurrentPos(pos);
+                      m_pos = pos;
+                      seekStream(pos);
+                      m_buffer.clear();
                   }
 
-                  int oldSize = currentBufferSize();
-                  while (currentBufferSize() < int(length)) {
+                  int oldSize = m_buffer.size();
+                  while (m_buffer.size() < int(length)) {
                       needData();
 
-                      if (oldSize == currentBufferSize()) {
+                      if (oldSize == m_buffer.size()) {
                           break; //we didn't get any data
                       }
-                      oldSize = currentBufferSize();
+                      oldSize = m_buffer.size();
                   }
 
-                  DWORD bytesRead = qMin(currentBufferSize(), int(length));
-                  {
-                      QWriteLocker locker(&m_lock);
-                      qMemCopy(buffer, m_buffer.data(), bytesRead);
-                      //truncate the buffer
-                      m_buffer = m_buffer.mid(bytesRead);
-                  }
+                  int bytesRead = qMin(m_buffer.size(), int(length));
+                  qMemCopy(buffer, m_buffer.data(), bytesRead);
+                  //truncate the buffer
+                  m_buffer = m_buffer.mid(bytesRead);
 
                   if (actual) {
                       *actual = bytesRead; //initialization
@@ -183,7 +154,6 @@ namespace Phonon
             qint64 m_pos;
             qint64 m_size;
 
-            QMutex m_mutexRead;
             const MediaGraph *m_mediaGraph;
         };
 
@@ -197,14 +167,6 @@ namespace Phonon
         IODeviceReader::~IODeviceReader()
         {
         }
-
-        STDMETHODIMP IODeviceReader::Stop()
-        {
-            HRESULT hr = QBaseFilter::Stop();
-            m_streamReader->enoughData(); //this asks to cancel any blocked call to needData
-            return hr;
-        }
-
     }
 }
 
diff --git a/src/3rdparty/phonon/ds9/iodevicereader.h b/src/3rdparty/phonon/ds9/iodevicereader.h
index af4b271..c8b91c3 100644
--- a/src/3rdparty/phonon/ds9/iodevicereader.h
+++ b/src/3rdparty/phonon/ds9/iodevicereader.h
@@ -41,7 +41,6 @@ namespace Phonon
         public:
             IODeviceReader(const MediaSource &source, const MediaGraph *);
             ~IODeviceReader();
-            STDMETHODIMP Stop();
 
         private:
             StreamReader *m_streamReader;
diff --git a/src/3rdparty/phonon/ds9/mediagraph.cpp b/src/3rdparty/phonon/ds9/mediagraph.cpp
index db0ec84..3e7a68b 100644
--- a/src/3rdparty/phonon/ds9/mediagraph.cpp
+++ b/src/3rdparty/phonon/ds9/mediagraph.cpp
@@ -68,6 +68,8 @@ namespace Phonon
             return ret;
         }
                 
+
+/*
         static HRESULT saveToFile(Graph graph, const QString &filepath)
         {
             const WCHAR wszStreamName[] = L"ActiveMovieGraph";
@@ -103,7 +105,7 @@ namespace Phonon
 
             return hr;
         }
-
+*/
 
         MediaGraph::MediaGraph(MediaObject *mo, short index) :
             m_graph(CLSID_FilterGraph, IID_IGraphBuilder),
@@ -377,11 +379,12 @@ namespace Phonon
             FILTER_INFO info;
             filter->QueryFilterInfo(&info);
 #ifdef GRAPH_DEBUG
-            qDebug() << "removeFilter" << QString::fromUtf16(info.achName);
+            qDebug() << "removeFilter" << QString((const QChar *)info.achName);
 #endif
             if (info.pGraph) {
                 info.pGraph->Release();
-                return m_graph->RemoveFilter(filter);
+                if (info.pGraph == m_graph)
+                    return m_graph->RemoveFilter(filter);
             }
 
             //already removed
@@ -537,11 +540,11 @@ namespace Phonon
                     const QList<OutputPin> outputs = BackendNode::pins(filter, PINDIR_OUTPUT);
                     for(int i = 0; i < outputs.count(); ++i) {
                         const OutputPin &pin = outputs.at(i);
-                        if (VFW_E_NOT_CONNECTED == pin->ConnectedTo(inPin.pparam())) {
+                        if (HRESULT(VFW_E_NOT_CONNECTED) == pin->ConnectedTo(inPin.pparam())) {
                             return SUCCEEDED(pin->Connect(newIn, 0));
                         }
                     }
-                    //we should never go here
+                    //we shoud never go here
                     return false;
                 } else {
                     QAMMediaType type;
@@ -679,7 +682,6 @@ namespace Phonon
  #ifndef QT_NO_PHONON_MEDIACONTROLLER
                } else if (source.discType() == Phonon::Cd) {
                     m_realSource = Filter(new QAudioCDPlayer);
-                    m_result = m_graph->AddFilter(m_realSource, 0);
 
 #endif //QT_NO_PHONON_MEDIACONTROLLER
                 } else {
@@ -809,7 +811,7 @@ namespace Phonon
                 for (int i = 0; i < outputs.count(); ++i) {
                     const OutputPin &out = outputs.at(i);
                     InputPin pin;
-                    if (out->ConnectedTo(pin.pparam()) == VFW_E_NOT_CONNECTED) {
+                    if (out->ConnectedTo(pin.pparam()) == HRESULT(VFW_E_NOT_CONNECTED)) {
                         m_decoderPins += out; //unconnected outputs can be decoded outputs
                     }
                 }
@@ -820,7 +822,7 @@ namespace Phonon
             //let's reestablish the connections
             for (int i = 0; i < connections.count(); ++i) {
                 const GraphConnection &connection = connections.at(i);
-                //check if we should transfer the sink node
+                //check if we shoud transfer the sink node
 
                 grabFilter(connection.input);
                 grabFilter(connection.output);
@@ -873,7 +875,7 @@ namespace Phonon
             {
                 FILTER_INFO info;
                 filter->QueryFilterInfo(&info);
-                qDebug() << Q_FUNC_INFO << QString::fromUtf16(info.achName);
+                qDebug() << Q_FUNC_INFO << QString((const QChar *)info.achName);
                 if (info.pGraph) {
                     info.pGraph->Release();
                 }
@@ -919,7 +921,7 @@ namespace Phonon
             {
                 FILTER_INFO info;
                 filter->QueryFilterInfo(&info);
-                qDebug() << "found a decoder filter" << QString::fromUtf16(info.achName);
+                qDebug() << "found a decoder filter" << QString((const QChar *)info.achName);
                 if (info.pGraph) {
                     info.pGraph->Release();
                 }
@@ -935,7 +937,7 @@ namespace Phonon
             {
                 FILTER_INFO info;
                 filter->QueryFilterInfo(&info);
-                qDebug() << Q_FUNC_INFO << QString::fromUtf16(info.achName);
+                qDebug() << Q_FUNC_INFO << QString((const QChar *)info.achName);
                 if (info.pGraph) {
                     info.pGraph->Release();
                 }
@@ -954,7 +956,7 @@ namespace Phonon
             {
                 FILTER_INFO info;
                 filter->QueryFilterInfo(&info);
-                qDebug() << Q_FUNC_INFO << QString::fromUtf16(info.achName);
+                qDebug() << Q_FUNC_INFO << QString((const QChar *)info.achName);
                 if (info.pGraph) {
                     info.pGraph->Release();
                 }
@@ -988,7 +990,7 @@ namespace Phonon
             {
                 FILTER_INFO info;
                 filter->QueryFilterInfo(&info);
-                qDebug() << "found a demuxer filter" << QString::fromUtf16(info.achName);
+                qDebug() << "found a demuxer filter" << QString((const QChar *)info.achName);
                 if (info.pGraph) {
                     info.pGraph->Release();
                 }
@@ -1006,27 +1008,27 @@ namespace Phonon
                 BSTR str;
                 HRESULT hr = mediaContent->get_AuthorName(&str);
                 if (SUCCEEDED(hr)) {
-                    ret.insert(QLatin1String("ARTIST"), QString::fromUtf16((const unsigned short*)str));
+                    ret.insert(QLatin1String("ARTIST"), QString::fromWCharArray(str));
                     SysFreeString(str);
                 }
                 hr = mediaContent->get_Title(&str);
                 if (SUCCEEDED(hr)) {
-                    ret.insert(QLatin1String("TITLE"), QString::fromUtf16((const unsigned short*)str));
+                    ret.insert(QLatin1String("TITLE"), QString::fromWCharArray(str));
                     SysFreeString(str);
                 }
                 hr = mediaContent->get_Description(&str);
                 if (SUCCEEDED(hr)) {
-                    ret.insert(QLatin1String("DESCRIPTION"), QString::fromUtf16((const unsigned short*)str));
+                    ret.insert(QLatin1String("DESCRIPTION"), QString::fromWCharArray(str));
                     SysFreeString(str);
                 }
                 hr = mediaContent->get_Copyright(&str);
                 if (SUCCEEDED(hr)) {
-                    ret.insert(QLatin1String("COPYRIGHT"), QString::fromUtf16((const unsigned short*)str));
+                    ret.insert(QLatin1String("COPYRIGHT"), QString::fromWCharArray(str));
                     SysFreeString(str);
                 }
                 hr = mediaContent->get_MoreInfoText(&str);
                 if (SUCCEEDED(hr)) {
-                    ret.insert(QLatin1String("MOREINFO"), QString::fromUtf16((const unsigned short*)str));
+                    ret.insert(QLatin1String("MOREINFO"), QString::fromWCharArray(str));
                     SysFreeString(str);
                 }
             }
diff --git a/src/3rdparty/phonon/ds9/mediaobject.cpp b/src/3rdparty/phonon/ds9/mediaobject.cpp
index d1e15c0..d640956 100644
--- a/src/3rdparty/phonon/ds9/mediaobject.cpp
+++ b/src/3rdparty/phonon/ds9/mediaobject.cpp
@@ -23,11 +23,13 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #ifndef Q_CC_MSVC
 #include <dshow.h>
-#endif //Q_CC_MSVC
+#endif
 #include <objbase.h>
 #include <initguid.h>
 #include <qnetwork.h>
-#include <comdef.h>
+#ifdef Q_CC_MSVC
+# include <comdef.h>
+#endif
 #include <evcode.h>
 
 #include "mediaobject.h"
@@ -50,7 +52,7 @@ namespace Phonon
 
         //first the definition of the WorkerThread class
         WorkerThread::WorkerThread()
-          : QThread(), m_currentRenderId(0), m_finished(false), m_currentWorkId(1)
+          : QThread(), m_finished(false), m_currentWorkId(1)
         {
         }
 
@@ -58,24 +60,6 @@ namespace Phonon
         {
         }
 
-        WorkerThread::Work WorkerThread::dequeueWork()
-        {
-            QMutexLocker locker(&m_mutex);
-            if (m_finished) {
-                return Work();
-            }
-            Work ret = m_queue.dequeue();
-
-            //we ensure to have the wait condition in the right state
-            if (m_queue.isEmpty()) {
-                m_waitCondition.reset();
-            } else {
-                m_waitCondition.set();
-            }
-
-            return ret;
-        }
-
         void WorkerThread::run()
         {
             while (m_finished == false) {
@@ -89,11 +73,6 @@ namespace Phonon
                 }
                 DWORD result = ::WaitForMultipleObjects(count, handles, FALSE, INFINITE);
                 if (result == WAIT_OBJECT_0) {
-                    if (m_finished) {
-                        //that's the end of the thread execution
-                        return;
-                    }
-
                     handleTask();
                 } else {
                     //this is the event management
@@ -181,6 +160,7 @@ namespace Phonon
             //we create a new graph
             w.graph = Graph(CLSID_FilterGraph, IID_IGraphBuilder);
             w.filter = filter;
+            w.graph->AddFilter(filter, 0);
             w.id = m_currentWorkId++;
             m_queue.enqueue(w);
             m_waitCondition.set();
@@ -200,23 +180,29 @@ namespace Phonon
 
         void WorkerThread::handleTask()
         {
-            const Work w = dequeueWork();
+            QMutexLocker locker(Backend::directShowMutex);
+            {
+                QMutexLocker locker(&m_mutex);
+                if (m_finished || m_queue.isEmpty()) {
+                    return;
+                }
 
-            if (m_finished) {
-                return;
+                m_currentWork = m_queue.dequeue();
+
+                //we ensure to have the wait condition in the right state
+                if (m_queue.isEmpty()) {
+                    m_waitCondition.reset();
+                } else {
+                    m_waitCondition.set();
+                }
             }
 
             HRESULT hr = S_OK;
 
-            m_currentRender = w.graph;
-			m_currentRenderId = w.id;
-            if (w.task == ReplaceGraph) {
-                QMutexLocker locker(&m_mutex);
-                HANDLE h;
-
+            if (m_currentWork.task == ReplaceGraph) {
                 int index = -1;
                 for(int i = 0; i < FILTER_COUNT; ++i) {
-                    if (m_graphHandle[i].graph == w.oldGraph) {
+                    if (m_graphHandle[i].graph == m_currentWork.oldGraph) {
                         m_graphHandle[i].graph = Graph();
                         index = i;
                         break;
@@ -229,51 +215,40 @@ namespace Phonon
                 Q_ASSERT(index != -1);
 
                 //add the new graph
-                if (SUCCEEDED(ComPointer<IMediaEvent>(w.graph, IID_IMediaEvent)
+                HANDLE h;
+                if (SUCCEEDED(ComPointer<IMediaEvent>(m_currentWork.graph, IID_IMediaEvent)
                     ->GetEventHandle(reinterpret_cast<OAEVENT*>(&h)))) {
-                    m_graphHandle[index].graph = w.graph;
+                    m_graphHandle[index].graph = m_currentWork.graph;
                     m_graphHandle[index].handle = h;
                 }
-            } else if (w.task == Render) {
-                if (w.filter) {
+            } else if (m_currentWork.task == Render) {
+                if (m_currentWork.filter) {
                     //let's render pins
-                    w.graph->AddFilter(w.filter, 0);
-                    const QList<OutputPin> outputs = BackendNode::pins(w.filter, PINDIR_OUTPUT);
-                    for (int i = 0; i < outputs.count(); ++i) {
-                        //blocking call
-                        hr = w.graph->Render(outputs.at(i));
-                        if (FAILED(hr)) {
-                            break;
-                        }
+                    const QList<OutputPin> outputs = BackendNode::pins(m_currentWork.filter, PINDIR_OUTPUT);
+                    for (int i = 0; SUCCEEDED(hr) && i < outputs.count(); ++i) {
+                        hr = m_currentWork.graph->Render(outputs.at(i));
                     }
-                } else if (!w.url.isEmpty()) {
+                } else if (!m_currentWork.url.isEmpty()) {
                     //let's render a url (blocking call)
-                    hr = w.graph->RenderFile(reinterpret_cast<const wchar_t *>(w.url.utf16()), 0);
+                    hr = m_currentWork.graph->RenderFile(reinterpret_cast<const wchar_t *>(m_currentWork.url.utf16()), 0);
                 }
                 if (hr != E_ABORT) {
-                    emit asyncRenderFinished(w.id, hr, w.graph);
+                    emit asyncRenderFinished(m_currentWork.id, hr, m_currentWork.graph);
                 }
-            } else if (w.task == Seek) {
+            } else if (m_currentWork.task == Seek) {
                 //that's a seekrequest
-                ComPointer<IMediaSeeking> mediaSeeking(w.graph, IID_IMediaSeeking);
-                qint64 newtime = w.time * 10000;
+                ComPointer<IMediaSeeking> mediaSeeking(m_currentWork.graph, IID_IMediaSeeking);
+                qint64 newtime = m_currentWork.time * 10000;
                 hr = mediaSeeking->SetPositions(&newtime, AM_SEEKING_AbsolutePositioning,
                     0, AM_SEEKING_NoPositioning);
-                qint64 currentTime = -1;
-                if (SUCCEEDED(hr)) {
-                    hr = mediaSeeking->GetCurrentPosition(&currentTime);
-                    if (SUCCEEDED(hr)) {
-                        currentTime /= 10000; //convert to ms
-                    }
-                }
-                emit asyncSeekingFinished(w.id, currentTime);
+                emit asyncSeekingFinished(m_currentWork.id, newtime / 10000);
                 hr = E_ABORT; //to avoid emitting asyncRenderFinished
-            } else if (w.task == ChangeState) {
+            } else if (m_currentWork.task == ChangeState) {
 
                 //remove useless decoders
                 QList<Filter> unused;
-                for (int i = 0; i < w.decoders.count(); ++i) {
-                    const Filter &filter = w.decoders.at(i);
+                for (int i = 0; i < m_currentWork.decoders.count(); ++i) {
+                    const Filter &filter = m_currentWork.decoders.at(i);
                     bool used = false;
                     const QList<OutputPin> pins = BackendNode::pins(filter, PINDIR_OUTPUT);
                     for( int i = 0; i < pins.count(); ++i) {
@@ -290,15 +265,15 @@ namespace Phonon
                 //we can get the state
                 for (int i = 0; i < unused.count(); ++i) {
                     //we should remove this filter from the graph
-                    w.graph->RemoveFilter(unused.at(i));
+                    m_currentWork.graph->RemoveFilter(unused.at(i));
                 }
 
 
                 //we can get the state
-                ComPointer<IMediaControl> mc(w.graph, IID_IMediaControl);
+                ComPointer<IMediaControl> mc(m_currentWork.graph, IID_IMediaControl);
 
                 //we change the state here
-                switch(w.state)
+                switch(m_currentWork.state)
                 {
                 case State_Stopped:
                     mc->Stop();
@@ -316,36 +291,38 @@ namespace Phonon
 
                 if (SUCCEEDED(hr)) {
                     if (s == State_Stopped) {
-                        emit stateReady(w.graph, Phonon::StoppedState);
+                        emit stateReady(m_currentWork.graph, Phonon::StoppedState);
                     } else if (s == State_Paused) {
-                        emit stateReady(w.graph, Phonon::PausedState);
+                        emit stateReady(m_currentWork.graph, Phonon::PausedState);
                     } else /*if (s == State_Running)*/ {
-                        emit stateReady(w.graph, Phonon::PlayingState);
+                        emit stateReady(m_currentWork.graph, Phonon::PlayingState);
                     }
                 }
             }
 
-            m_currentRender = Graph();
-			m_currentRenderId = 0;
-
+            {
+                QMutexLocker locker(&m_mutex);
+                m_currentWork = Work(); //reinitialize
+            }
         }
 
-		void WorkerThread::abortCurrentRender(qint16 renderId)
-		{
+        void WorkerThread::abortCurrentRender(qint16 renderId)
+        {
             QMutexLocker locker(&m_mutex);
+            if (m_currentWork.id == renderId) {
+                m_currentWork.graph->Abort();
+            }
             bool found = false;
-            //we try to see if there is already an attempt to seek and we remove it
             for(int i = 0; !found && i < m_queue.size(); ++i) {
                 const Work &w = m_queue.at(i);
                 if (w.id == renderId) {
                     found = true;
                     m_queue.removeAt(i);
+                    if (m_queue.isEmpty()) {
+                        m_waitCondition.reset();
+                    }
                 }
             }
-
-            if (m_currentRender && m_currentRenderId == renderId) {
-                m_currentRender->Abort();
-            }
         }
 
         //tells the thread to stop processing
@@ -353,9 +330,9 @@ namespace Phonon
         {
             QMutexLocker locker(&m_mutex);
             m_queue.clear();
-            if (m_currentRender) {
+            if (m_currentWork.graph) {
                 //in case we're currently rendering something
-                m_currentRender->Abort();
+                m_currentWork.graph->Abort();
 
             }
 
@@ -387,17 +364,17 @@ namespace Phonon
                 m_graphs[i] = new MediaGraph(this, i);
             }
 
-            connect(&m_thread, SIGNAL(stateReady(Graph, Phonon::State)),
-                               SLOT(slotStateReady(Graph, Phonon::State)));
+            connect(&m_thread, SIGNAL(stateReady(Graph,Phonon::State)),
+                               SLOT(slotStateReady(Graph,Phonon::State)));
 
-            connect(&m_thread, SIGNAL(eventReady(Graph, long, long)),
-                               SLOT(handleEvents(Graph, long, long)));
+            connect(&m_thread, SIGNAL(eventReady(Graph,long,long)),
+                               SLOT(handleEvents(Graph,long,long)));
 
-            connect(&m_thread, SIGNAL(asyncRenderFinished(quint16, HRESULT, Graph)),
-                SLOT(finishLoading(quint16, HRESULT, Graph)));
+            connect(&m_thread, SIGNAL(asyncRenderFinished(quint16,HRESULT,Graph)),
+                SLOT(finishLoading(quint16,HRESULT,Graph)));
 
-            connect(&m_thread, SIGNAL(asyncSeekingFinished(quint16, qint64)),
-                SLOT(finishSeeking(quint16, qint64)));
+            connect(&m_thread, SIGNAL(asyncSeekingFinished(quint16,qint64)),
+                SLOT(finishSeeking(quint16,qint64)));
             //really special case
             m_mediaObject = this;
             m_thread.start();
@@ -520,6 +497,18 @@ namespace Phonon
 
             qSwap(m_graphs[0], m_graphs[1]); //swap the graphs
 
+            if (m_transitionTime >= 0)
+                m_graphs[1]->stop(); //make sure we stop the previous graph
+
+            if (currentGraph()->mediaSource().type() != Phonon::MediaSource::Invalid &&
+                catchComError(currentGraph()->renderResult())) {
+                    setState(Phonon::ErrorState);
+                    return;
+            }
+
+            //we need to play the next media
+            play();
+
             //we tell the video widgets to switch now to the new source
 #ifndef QT_NO_PHONON_VIDEO
             for (int i = 0; i < m_videoWidgets.count(); ++i) {
@@ -528,15 +517,6 @@ namespace Phonon
 #endif //QT_NO_PHONON_VIDEO
 
             emit currentSourceChanged(currentGraph()->mediaSource());
-
-            if (currentGraph()->isLoading()) {
-                //will simply tell that when loading is finished 
-                //it should start the playback
-                play(); 
-            }
-
-
-
             emit metaDataChanged(currentGraph()->metadata());
 
             if (nextGraph()->hasVideo() != currentGraph()->hasVideo()) {
@@ -549,15 +529,6 @@ namespace Phonon
 #ifndef QT_NO_PHONON_MEDIACONTROLLER
             setTitles(currentGraph()->titles());
 #endif //QT_NO_PHONON_MEDIACONTROLLER
-
-            //this manages only gapless transitions
-            if (currentGraph()->mediaSource().type() != Phonon::MediaSource::Invalid) {
-                if (catchComError(currentGraph()->renderResult())) {
-                    setState(Phonon::ErrorState);
-                } else {
-                    play();
-                }
-            }
         }
 
         Phonon::State MediaObject::state() const
@@ -792,15 +763,16 @@ namespace Phonon
                 case Phonon::PausedState:
                     pause();
                     break;
-                case Phonon::StoppedState:
-                    stop();
-                    break;
                 case Phonon::PlayingState:
                     play();
                     break;
                 case Phonon::ErrorState:
                     setState(Phonon::ErrorState);
                     break;
+                case Phonon::StoppedState:
+                default:
+                    stop();
+                    break;
                 }
             }
         }
@@ -848,11 +820,11 @@ namespace Phonon
 #endif
                 LPAMGETERRORTEXT getErrorText = (LPAMGETERRORTEXT)QLibrary::resolve(QLatin1String("quartz"), "AMGetErrorTextW");
 
-                ushort buffer[MAX_ERROR_TEXT_LEN];
-                if (getErrorText && getErrorText(hr, (WCHAR*)buffer, MAX_ERROR_TEXT_LEN)) {
-                    m_errorString = QString::fromUtf16(buffer);
+                WCHAR buffer[MAX_ERROR_TEXT_LEN];
+                if (getErrorText && getErrorText(hr, buffer, MAX_ERROR_TEXT_LEN)) {
+                    m_errorString = QString::fromWCharArray(buffer);
                 } else {
-                    m_errorString = QString::fromUtf16((ushort*)_com_error(hr).ErrorMessage());
+                    m_errorString = QString::fromLatin1("Unknown error");
                 }
                 const QString comError = QString::number(uint(hr), 16);
                 if (!m_errorString.toLower().contains(comError.toLower())) {
diff --git a/src/3rdparty/phonon/ds9/mediaobject.h b/src/3rdparty/phonon/ds9/mediaobject.h
index 2c34ffc..34aa666 100644
--- a/src/3rdparty/phonon/ds9/mediaobject.h
+++ b/src/3rdparty/phonon/ds9/mediaobject.h
@@ -114,6 +114,7 @@ namespace Phonon
 
             enum Task
             {
+                None,
                 Render,
                 Seek,
                 ChangeState,
@@ -122,6 +123,7 @@ namespace Phonon
 
             struct Work
             {
+                Work() : task(None), id(0), time(0) { }
                 Task task;
                 quint16 id;
                 Graph graph;
@@ -135,16 +137,14 @@ namespace Phonon
                 };
                 QList<Filter> decoders; //for the state change requests
             };
-            Work dequeueWork();
             void handleTask();
 
-            Graph m_currentRender;
-			qint16 m_currentRenderId;
+            Work m_currentWork;
             QQueue<Work> m_queue;
             bool m_finished;
             quint16 m_currentWorkId;
             QWinWaitCondition m_waitCondition;
-            QMutex m_mutex;
+            QMutex m_mutex; // mutex for the m_queue, m_finished and m_currentWorkId
 
             //this is for WaitForMultipleObjects
             struct
diff --git a/src/3rdparty/phonon/ds9/qasyncreader.cpp b/src/3rdparty/phonon/ds9/qasyncreader.cpp
index 68ec1f8..a3f9cda 100644
--- a/src/3rdparty/phonon/ds9/qasyncreader.cpp
+++ b/src/3rdparty/phonon/ds9/qasyncreader.cpp
@@ -15,8 +15,6 @@ You should have received a copy of the GNU Lesser General Public License
 along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <QtCore/QFile>
-
 #include "qasyncreader.h"
 #include "qbasefilter.h"
 
@@ -80,8 +78,7 @@ namespace Phonon
 
         STDMETHODIMP QAsyncReader::Request(IMediaSample *sample,DWORD_PTR user)
         {
-            QMutexLocker mutexLocker(&m_mutexWait);
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (m_flushing) {
                 return VFW_E_WRONG_STATE;
             }
@@ -93,33 +90,28 @@ namespace Phonon
 
         STDMETHODIMP QAsyncReader::WaitForNext(DWORD timeout, IMediaSample **sample, DWORD_PTR *user)
         {
-            QMutexLocker locker(&m_mutexWait);
+            QMutexLocker locker(&m_mutex);
             if (!sample ||!user) {
                 return E_POINTER;
             }
 
+            //msdn says to return immediately if we're flushing but that doesn't seem to be true
+            //since it triggers a dead-lock somewhere inside directshow (see task 258830)
+
             *sample = 0;
             *user = 0;
 
-            AsyncRequest r = getNextRequest();
-
-            if (r.sample == 0) {
-                //there is no request in the queue
-                if (isFlushing()) {
+            if (m_requestQueue.isEmpty()) {
+                if (m_requestWait.wait(&m_mutex, timeout) == false) {
+                    return VFW_E_TIMEOUT;
+                }
+                if (m_requestQueue.isEmpty()) {
                     return VFW_E_WRONG_STATE;
-                } else {
-                    //First we need to lock the mutex
-                    if (m_requestWait.wait(&m_mutexWait, timeout) == false) {
-                        return VFW_E_TIMEOUT;
-                    }
-                    if (isFlushing()) {
-                        return VFW_E_WRONG_STATE;
-                    }
-
-                    r = getNextRequest();
                 }
             }
 
+            AsyncRequest r = m_requestQueue.dequeue();
+
             //at this point we're sure to have a request to proceed
             if (r.sample == 0) {
                 return E_FAIL;
@@ -127,14 +119,12 @@ namespace Phonon
 
             *sample = r.sample;
             *user = r.user;
-
-            return SyncReadAligned(r.sample);
+            return syncReadAlignedUnlocked(r.sample);
         }
 
         STDMETHODIMP QAsyncReader::BeginFlush()
         {
-            QMutexLocker mutexLocker(&m_mutexWait);
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_flushing = true;
             m_requestWait.wakeOne();
             return S_OK;
@@ -142,13 +132,28 @@ namespace Phonon
 
         STDMETHODIMP QAsyncReader::EndFlush()
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_flushing = false;
             return S_OK;
         }
 
         STDMETHODIMP QAsyncReader::SyncReadAligned(IMediaSample *sample)
         {
+            QMutexLocker locker(&m_mutex);
+            return syncReadAlignedUnlocked(sample);
+        }
+
+        STDMETHODIMP QAsyncReader::SyncRead(LONGLONG pos, LONG length, BYTE *buffer)
+        {
+            QMutexLocker locker(&m_mutex);
+            return read(pos, length, buffer, 0);
+        }
+
+
+        STDMETHODIMP QAsyncReader::syncReadAlignedUnlocked(IMediaSample *sample)
+        {
+            Q_ASSERT(!m_mutex.tryLock());
+
             if (!sample) {
                 return E_POINTER;
             }
@@ -175,23 +180,6 @@ namespace Phonon
             return sample->SetActualDataLength(actual);
         }
 
-        STDMETHODIMP QAsyncReader::SyncRead(LONGLONG pos, LONG length, BYTE *buffer)
-        {
-            return read(pos, length, buffer, 0);
-        }
-
-
-        //addition
-        QAsyncReader::AsyncRequest QAsyncReader::getNextRequest()
-        {
-            QWriteLocker locker(&m_lock);
-            AsyncRequest ret;
-            if (!m_requestQueue.isEmpty()) {
-                ret = m_requestQueue.dequeue();
-            }
-
-            return ret;
-        }
     }
 }
 
diff --git a/src/3rdparty/phonon/ds9/qasyncreader.h b/src/3rdparty/phonon/ds9/qasyncreader.h
index cb789ee..95872f9 100644
--- a/src/3rdparty/phonon/ds9/qasyncreader.h
+++ b/src/3rdparty/phonon/ds9/qasyncreader.h
@@ -48,11 +48,12 @@ namespace Phonon
             STDMETHODIMP WaitForNext(DWORD,IMediaSample **,DWORD_PTR *);
             STDMETHODIMP SyncReadAligned(IMediaSample *);
             STDMETHODIMP SyncRead(LONGLONG,LONG,BYTE *);
-            virtual STDMETHODIMP Length(LONGLONG *,LONGLONG *) = 0;
+            STDMETHODIMP Length(LONGLONG *,LONGLONG *) = 0;
             STDMETHODIMP BeginFlush();
             STDMETHODIMP EndFlush();
 
         protected:
+            STDMETHODIMP syncReadAlignedUnlocked(IMediaSample *);
             virtual HRESULT read(LONGLONG pos, LONG length, BYTE *buffer, LONG *actual) = 0;
 
         private:
@@ -62,9 +63,6 @@ namespace Phonon
                 IMediaSample *sample;
                 DWORD_PTR user;
             };
-            AsyncRequest getNextRequest();
-
-            QMutex m_mutexWait;
 
             QQueue<AsyncRequest> m_requestQueue;
             QWaitCondition m_requestWait;
diff --git a/src/3rdparty/phonon/ds9/qaudiocdreader.cpp b/src/3rdparty/phonon/ds9/qaudiocdreader.cpp
index b9f9fd6..6d0f335 100644
--- a/src/3rdparty/phonon/ds9/qaudiocdreader.cpp
+++ b/src/3rdparty/phonon/ds9/qaudiocdreader.cpp
@@ -103,8 +103,8 @@ namespace Phonon
 
         private:
             HANDLE m_cddrive;
-            CDROM_TOC *m_toc;
-            WaveStructure *m_waveHeader;
+            CDROM_TOC m_toc;
+            WaveStructure m_waveHeader;
             qint64 m_trackAddress;
         };
 
@@ -112,19 +112,8 @@ namespace Phonon
 #define SECTOR_SIZE 2352
 #define NB_SECTORS_READ 20
 
-        static AM_MEDIA_TYPE getAudioCDMediaType()
-        {
-            AM_MEDIA_TYPE mt;
-            qMemSet(&mt, 0, sizeof(AM_MEDIA_TYPE));
-            mt.majortype = MEDIATYPE_Stream;
-            mt.subtype = MEDIASUBTYPE_WAVE;
-            mt.bFixedSizeSamples = TRUE;
-            mt.bTemporalCompression = FALSE;
-            mt.lSampleSize = 1;
-            mt.formattype = GUID_NULL;
-            return mt;
-        }
-
+        static const AM_MEDIA_TYPE audioCDMediaType = { MEDIATYPE_Stream, MEDIASUBTYPE_WAVE, TRUE, FALSE, 1, GUID_NULL, 0, 0, 0};
+ 
         int addressToSectors(UCHAR address[4])
         {
             return ((address[0] * 60 + address[1]) * 60 + address[2]) * 75 + address[3] - 150;
@@ -141,11 +130,8 @@ namespace Phonon
         }
 
 
-        QAudioCDReader::QAudioCDReader(QBaseFilter *parent, QChar drive) : QAsyncReader(parent, QVector<AM_MEDIA_TYPE>() << getAudioCDMediaType())
+        QAudioCDReader::QAudioCDReader(QBaseFilter *parent, QChar drive) : QAsyncReader(parent, QVector<AM_MEDIA_TYPE>() << audioCDMediaType)
         {
-            m_toc = new CDROM_TOC;
-            m_waveHeader = new WaveStructure;
-
             //now open the cd-drive
             QString path; 
             if (drive.isNull()) {
@@ -154,36 +140,30 @@ namespace Phonon
                 path = QString::fromLatin1("\\\\.\\%1:").arg(drive); 	 
             }
 
-            m_cddrive = QT_WA_INLINE (
-			::CreateFile( (TCHAR*)path.utf16(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL ),
-			::CreateFileA( path.toLocal8Bit().constData(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL )
-	                );
+            m_cddrive = ::CreateFile((const wchar_t *)path.utf16(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
 
-            qMemSet(m_toc, 0, sizeof(CDROM_TOC));
+            qMemSet(&m_toc, 0, sizeof(CDROM_TOC));
             //read the TOC
             DWORD bytesRead = 0;
-            bool tocRead = ::DeviceIoControl(m_cddrive, IOCTL_CDROM_READ_TOC, 0, 0, m_toc, sizeof(CDROM_TOC), &bytesRead, 0);
+            bool tocRead = ::DeviceIoControl(m_cddrive, IOCTL_CDROM_READ_TOC, 0, 0, &m_toc, sizeof(CDROM_TOC), &bytesRead, 0);
 
             if (!tocRead) {
                 qWarning("unable to load the TOC from the CD");
                 return;
             }
 
-            m_trackAddress = addressToSectors(m_toc->TrackData[0].Address);
-            const qint32 nbSectorsToRead = (addressToSectors(m_toc->TrackData[m_toc->LastTrack + 1 - m_toc->FirstTrack].Address) 
+            m_trackAddress = addressToSectors(m_toc.TrackData[0].Address);
+            const qint32 nbSectorsToRead = (addressToSectors(m_toc.TrackData[m_toc.LastTrack + 1 - m_toc.FirstTrack].Address) 
                 - m_trackAddress);
             const qint32 dataLength = nbSectorsToRead * SECTOR_SIZE;
 
-            m_waveHeader->chunksize = 4 + (8 + m_waveHeader->chunksize2) + (8 + dataLength);
-            m_waveHeader->dataLength = dataLength;
+            m_waveHeader.chunksize = 4 + (8 + m_waveHeader.chunksize2) + (8 + dataLength);
+            m_waveHeader.dataLength = dataLength;
         }
 
         QAudioCDReader::~QAudioCDReader()
         {
             ::CloseHandle(m_cddrive);
-            delete m_toc;
-            delete m_waveHeader;
-
         }
 
         STDMETHODIMP_(ULONG) QAudioCDReader::AddRef()
@@ -199,7 +179,7 @@ namespace Phonon
 
         STDMETHODIMP QAudioCDReader::Length(LONGLONG *total,LONGLONG *available)
         {
-            const LONGLONG length = sizeof(WaveStructure) + m_waveHeader->dataLength;
+            const LONGLONG length = sizeof(WaveStructure) + m_waveHeader.dataLength;
             if (total) {
                 *total = length;
             }
@@ -238,11 +218,11 @@ namespace Phonon
             if (pos < sizeof(WaveStructure)) {
                 //we first copy the content of the structure
                 nbRead = qMin(LONG(sizeof(WaveStructure) - pos), length);
-                qMemCopy(buffer, reinterpret_cast<char*>(m_waveHeader) + pos, nbRead);
+                qMemCopy(buffer, reinterpret_cast<char*>(&m_waveHeader) + pos, nbRead);
             }
 
             const LONGLONG posInTrack = pos - sizeof(WaveStructure) + nbRead;
-            const int bytesLeft = qMin(m_waveHeader->dataLength - posInTrack, LONGLONG(length - nbRead));
+            const int bytesLeft = qMin(m_waveHeader.dataLength - posInTrack, LONGLONG(length - nbRead));
 
             if (bytesLeft > 0) {
 
@@ -297,8 +277,8 @@ namespace Phonon
         {
             QList<qint64> ret;
             ret << 0;
-            for(int i = m_toc->FirstTrack; i <= m_toc->LastTrack ; ++i) {
-                const uchar *address = m_toc->TrackData[i].Address;
+            for(int i = m_toc.FirstTrack; i <= m_toc.LastTrack ; ++i) {
+                const uchar *address = m_toc.TrackData[i].Address;
                 ret << ((address[0] * 60 + address[1]) * 60 + address[2]) * 1000 + address[3]*1000/75 - 2000;
 
             }
diff --git a/src/3rdparty/phonon/ds9/qaudiocdreader.h b/src/3rdparty/phonon/ds9/qaudiocdreader.h
index 9049b66..eff845d 100644
--- a/src/3rdparty/phonon/ds9/qaudiocdreader.h
+++ b/src/3rdparty/phonon/ds9/qaudiocdreader.h
@@ -31,7 +31,7 @@ namespace Phonon
     {
         struct CDROM_TOC;
         struct WaveStructure;
-        extern const IID IID_ITitleInterface;
+        EXTERN_C const IID IID_ITitleInterface;
 
         //interface for the Titles
         struct ITitleInterface : public IUnknown
diff --git a/src/3rdparty/phonon/ds9/qbasefilter.cpp b/src/3rdparty/phonon/ds9/qbasefilter.cpp
index 95cab92..78b8b8f 100644
--- a/src/3rdparty/phonon/ds9/qbasefilter.cpp
+++ b/src/3rdparty/phonon/ds9/qbasefilter.cpp
@@ -92,8 +92,8 @@ namespace Phonon
                     return E_POINTER;
                 }
 
-                int nbfetched = 0;
-                while (nbfetched < int(count) && m_index < m_pins.count()) {
+                uint nbfetched = 0;
+                while (nbfetched < count && m_index < m_pins.count()) {
                     IPin *current = m_pins[m_index];
                     current->AddRef();
                     ret[nbfetched] = current;
@@ -166,19 +166,19 @@ namespace Phonon
 
         const QList<QPin *> QBaseFilter::pins() const
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             return m_pins;
         }
 
         void QBaseFilter::addPin(QPin *pin)
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_pins.append(pin);
         }
 
         void QBaseFilter::removePin(QPin *pin)
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_pins.removeAll(pin);
         }
 
@@ -211,7 +211,8 @@ namespace Phonon
             }
             else if (iid == IID_IMediaPosition || iid == IID_IMediaSeeking) {
                 if (inputPins().isEmpty()) {
-                    if (*out = getUpStreamInterface(iid)) {
+                    *out = getUpStreamInterface(iid);
+                    if (*out) {
                         return S_OK; //we return here to avoid adding a reference
                     } else {
                         hr = E_NOINTERFACE;
@@ -250,35 +251,35 @@ namespace Phonon
 
         STDMETHODIMP QBaseFilter::GetClassID(CLSID *clsid)
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             *clsid = m_clsid;
             return S_OK;
         }
 
         STDMETHODIMP QBaseFilter::Stop()
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_state = State_Stopped;
             return S_OK;
         }
 
         STDMETHODIMP QBaseFilter::Pause()
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_state = State_Paused;
             return S_OK;
         }
 
         STDMETHODIMP QBaseFilter::Run(REFERENCE_TIME)
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_state = State_Running;
             return S_OK;
         }
 
         STDMETHODIMP QBaseFilter::GetState(DWORD, FILTER_STATE *state)
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (!state) {
                 return E_POINTER;
             }
@@ -289,7 +290,7 @@ namespace Phonon
 
         STDMETHODIMP QBaseFilter::SetSyncSource(IReferenceClock *clock)
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (clock) {
                 clock->AddRef();
             }
@@ -302,7 +303,7 @@ namespace Phonon
 
         STDMETHODIMP QBaseFilter::GetSyncSource(IReferenceClock **clock)
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (!clock) {
                 return E_POINTER;
             }
@@ -341,7 +342,7 @@ namespace Phonon
 
         STDMETHODIMP QBaseFilter::QueryFilterInfo(FILTER_INFO *info )
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (!info) {
                 return E_POINTER;
             }
@@ -355,9 +356,9 @@ namespace Phonon
 
         STDMETHODIMP QBaseFilter::JoinFilterGraph(IFilterGraph *graph, LPCWSTR name)
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_graph = graph;
-            m_name = QString::fromUtf16((const unsigned short*)name);
+            m_name = QString::fromWCharArray(name);
             return S_OK;
         }
 
diff --git a/src/3rdparty/phonon/ds9/qbasefilter.h b/src/3rdparty/phonon/ds9/qbasefilter.h
index 85f1431..a72d6fe 100644
--- a/src/3rdparty/phonon/ds9/qbasefilter.h
+++ b/src/3rdparty/phonon/ds9/qbasefilter.h
@@ -22,7 +22,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QtCore/QString>
 #include <QtCore/QList>
-#include <QtCore/QReadWriteLock>
+#include <QtCore/QMutex>
 
 #include <dshow.h>
 
@@ -127,7 +127,7 @@ namespace Phonon
             IFilterGraph *m_graph;
             FILTER_STATE m_state;
             QList<QPin *> m_pins;
-            mutable QReadWriteLock m_lock;
+            mutable QMutex m_mutex;
         };
     }
 }
diff --git a/src/3rdparty/phonon/ds9/qevr9.h b/src/3rdparty/phonon/ds9/qevr9.h
new file mode 100644
index 0000000..8599fce
--- /dev/null
+++ b/src/3rdparty/phonon/ds9/qevr9.h
@@ -0,0 +1,143 @@
+/*  This file is part of the KDE project.
+
+Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2.1 or 3 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <d3d9.h>
+
+#define	DXVA2_ProcAmp_Brightness 1
+#define DXVA2_ProcAmp_Contrast   2
+#define DXVA2_ProcAmp_Hue        4
+#define DXVA2_ProcAmp_Saturation 8
+
+typedef enum {
+    MFVideoARMode_None             = 0x00000000,
+    MFVideoARMode_PreservePicture  = 0x00000001,
+    MFVideoARMode_PreservePixel    = 0x00000002,
+    MFVideoARMode_NonLinearStretch = 0x00000004,
+    MFVideoARMode_Mask             = 0x00000007
+} MFVideoAspectRatioMode;
+
+typedef struct {
+    float  left;
+    float  top;
+    float  right;
+    float  bottom;
+} MFVideoNormalizedRect;
+
+typedef struct {
+    UINT    DeviceCaps;
+    D3DPOOL InputPool;
+    UINT    NumForwardRefSamples;
+    UINT    NumBackwardRefSamples;
+    UINT    Reserved;
+    UINT    DeinterlaceTechnology;
+    UINT    ProcAmpControlCaps;
+    UINT    VideoProcessorOperations;
+    UINT    NoiseFilterTechnology;
+    UINT    DetailFilterTechnology;
+} DXVA2_VideoProcessorCaps;
+
+typedef struct {
+    union {
+        struct {
+            USHORT Fraction;
+            SHORT  Value;
+        };
+        LONG ll;
+    };
+} DXVA2_Fixed32;
+
+typedef struct {
+    DXVA2_Fixed32 MinValue;
+    DXVA2_Fixed32 MaxValue;
+    DXVA2_Fixed32 DefaultValue;
+    DXVA2_Fixed32 StepSize;
+} DXVA2_ValueRange;
+
+typedef struct {
+    DXVA2_Fixed32 Brightness;
+    DXVA2_Fixed32 Contrast;
+    DXVA2_Fixed32 Hue;
+    DXVA2_Fixed32 Saturation;
+} DXVA2_ProcAmpValues;
+
+DXVA2_Fixed32 DXVA2FloatToFixed(const float _float_)
+{
+    DXVA2_Fixed32 _fixed_;
+    _fixed_.Fraction = LOWORD(_float_ * 0x10000);
+    _fixed_.Value = HIWORD(_float_ * 0x10000);
+    return _fixed_;
+}
+
+float DXVA2FixedToFloat(const DXVA2_Fixed32 _fixed_)
+{
+    return (FLOAT)_fixed_.Value + (FLOAT)_fixed_.Fraction / 0x10000;
+}
+
+#undef INTERFACE
+#define INTERFACE IMFVideoDisplayControl
+DECLARE_INTERFACE_(IMFVideoDisplayControl, IUnknown)
+{
+    STDMETHOD(GetNativeVideoSize)(THIS_ SIZE* pszVideo, SIZE* pszARVideo) PURE;
+    STDMETHOD(GetIdealVideoSize)(THIS_ SIZE* pszMin, SIZE* pszMax) PURE;
+    STDMETHOD(SetVideoPosition)(THIS_ const MFVideoNormalizedRect* pnrcSource, const LPRECT prcDest) PURE;
+    STDMETHOD(GetVideoPosition)(THIS_ MFVideoNormalizedRect* pnrcSource, LPRECT prcDest) PURE;
+    STDMETHOD(SetAspectRatioMode)(THIS_ DWORD dwAspectRatioMode) PURE;
+    STDMETHOD(GetAspectRatioMode)(THIS_ DWORD* pdwAspectRatioMode) PURE;
+    STDMETHOD(SetVideoWindow)(THIS_ HWND hwndVideo) PURE;
+    STDMETHOD(GetVideoWindow)(THIS_ HWND* phwndVideo) PURE;
+    STDMETHOD(RepaintVideo)(THIS_) PURE;
+    STDMETHOD(GetCurrentImage)(THIS_ BITMAPINFOHEADER* pBih, BYTE** pDib, DWORD* pcbDib, LONGLONG* pTimeStamp) PURE;
+    STDMETHOD(SetBorderColor)(THIS_ COLORREF Clr) PURE;
+    STDMETHOD(GetBorderColor)(THIS_ COLORREF* pClr) PURE;
+    STDMETHOD(SetRenderingPrefs)(THIS_ DWORD dwRenderFlags) PURE;
+    STDMETHOD(GetRenderingPrefs)(THIS_ DWORD* pdwRenderFlags) PURE;
+    STDMETHOD(SetFullScreen)(THIS_ BOOL fFullscreen) PURE;
+    STDMETHOD(GetFullScreen)(THIS_ BOOL* pfFullscreen) PURE;
+};
+#undef INTERFACE
+#define INTERFACE IMFVideoMixerControl
+DECLARE_INTERFACE_(IMFVideoMixerControl, IUnknown)
+{
+    STDMETHOD(SetStreamZOrder)(THIS_ DWORD dwStreamID, DWORD dwZ) PURE;
+    STDMETHOD(GetStreamZOrder)(THIS_ DWORD dwStreamID, DWORD* pdwZ) PURE;
+    STDMETHOD(SetStreamOutputRect)(THIS_ DWORD dwStreamID, const MFVideoNormalizedRect* pnrcOutput) PURE;
+    STDMETHOD(GetStreamOutputRect)(THIS_ DWORD dwStreamID, MFVideoNormalizedRect* pnrcOutput) PURE;
+};
+#undef INTERFACE
+#define INTERFACE IMFVideoProcessor
+DECLARE_INTERFACE_(IMFVideoProcessor, IUnknown)
+{
+    STDMETHOD(GetAvailableVideoProcessorModes)(THIS_ UINT* lpdwNumProcessingModes, GUID** ppVideoProcessingModes) PURE;
+    STDMETHOD(GetVideoProcessorCaps)(THIS_ LPGUID lpVideoProcessorMode, DXVA2_VideoProcessorCaps* lpVideoProcessorCaps) PURE;
+    STDMETHOD(GetVideoProcessorMode)(THIS_ LPGUID lpMode) PURE;
+    STDMETHOD(SetVideoProcessorMode)(THIS_ LPGUID lpMode) PURE;
+    STDMETHOD(GetProcAmpRange)(THIS_ DWORD dwProperty, DXVA2_ValueRange* pPropRange) PURE;
+    STDMETHOD(GetProcAmpValues)(THIS_ DWORD dwFlags, DXVA2_ProcAmpValues* Values) PURE;
+    STDMETHOD(SetProcAmpValues)(THIS_ DWORD  dwFlags, DXVA2_ProcAmpValues*  pValues) PURE;
+    STDMETHOD(GetFilteringRange)(THIS_ DWORD dwProperty, DXVA2_ValueRange* pPropRange) PURE;
+    STDMETHOD(GetFilteringValue)(THIS_ DWORD dwProperty, DXVA2_Fixed32* pValue) PURE;
+    STDMETHOD(SetFilteringValue)(THIS_ DWORD dwProperty, DXVA2_Fixed32* pValue) PURE;
+    STDMETHOD(GetBackgroundColor)(THIS_ COLORREF* lpClrBkg) PURE;
+    STDMETHOD(SetBackgroundColor)(THIS_ COLORREF ClrBkg) PURE;
+};
+#undef INTERFACE
+#define INTERFACE IMFGetService
+DECLARE_INTERFACE_(IMFGetService, IUnknown)
+{
+    STDMETHOD(GetService)(THIS_ REFGUID guidService, REFIID riid, LPVOID* ppvObject) PURE;
+};
+#undef INTERFACE
diff --git a/src/3rdparty/phonon/ds9/qmeminputpin.cpp b/src/3rdparty/phonon/ds9/qmeminputpin.cpp
index dca99db..a21fbe7 100644
--- a/src/3rdparty/phonon/ds9/qmeminputpin.cpp
+++ b/src/3rdparty/phonon/ds9/qmeminputpin.cpp
@@ -28,8 +28,8 @@ namespace Phonon
     namespace DS9
     {
 
-        QMemInputPin::QMemInputPin(QBaseFilter *parent, const QVector<AM_MEDIA_TYPE> &mt, bool transform) :
-            QPin(parent, PINDIR_INPUT, mt), m_shouldDuplicateSamples(true), m_transform(transform)
+        QMemInputPin::QMemInputPin(QBaseFilter *parent, const QVector<AM_MEDIA_TYPE> &mt, bool transform, QPin *output) :
+            QPin(parent, PINDIR_INPUT, mt), m_shouldDuplicateSamples(true), m_transform(transform), m_output(output)
         {
         }
 
@@ -66,11 +66,9 @@ namespace Phonon
         {
             //this allows to serialize with Receive calls
             QMutexLocker locker(&m_mutexReceive);
-            for(int i = 0; i < m_outputs.count(); ++i) {
-                IPin *conn = m_outputs.at(i)->connected();
-                if (conn) {
-                    conn->EndOfStream();
-                }
+            IPin *conn = m_output ? m_output->connected() : 0;
+            if (conn) {
+                conn->EndOfStream();
             }
             return S_OK;
         }
@@ -78,13 +76,11 @@ namespace Phonon
         STDMETHODIMP QMemInputPin::BeginFlush()
         {
             //pass downstream
-            for(int i = 0; i < m_outputs.count(); ++i) {
-                IPin *conn = m_outputs.at(i)->connected();
-                if (conn) {
-                    conn->BeginFlush();
-                }
+            IPin *conn = m_output ? m_output->connected() : 0;
+            if (conn) {
+                conn->BeginFlush();
             }
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_flushing = true;
             return S_OK;
         }
@@ -92,22 +88,19 @@ namespace Phonon
         STDMETHODIMP QMemInputPin::EndFlush()
         {
             //pass downstream
-            for(int i = 0; i < m_outputs.count(); ++i) {
-                IPin *conn = m_outputs.at(i)->connected();
-                if (conn) {
-                    conn->EndFlush();
-                }
+            IPin *conn = m_output ? m_output->connected() : 0;
+            if (conn) {
+                conn->EndFlush();
             }
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             m_flushing = false;
             return S_OK;
         }
 
         STDMETHODIMP QMemInputPin::NewSegment(REFERENCE_TIME start, REFERENCE_TIME stop, double rate)
         {
-            for(int i = 0; i < m_outputs.count(); ++i) {
-                m_outputs.at(i)->NewSegment(start, stop, rate);
-            }
+            if (m_output)
+                m_output->NewSegment(start, stop, rate);
             return S_OK;
         }
 
@@ -119,14 +112,9 @@ namespace Phonon
             if (hr == S_OK &&
                 mt->majortype != MEDIATYPE_NULL &&
                 mt->subtype != MEDIASUBTYPE_NULL &&
-                mt->formattype != GUID_NULL) {
-                    //we tell the output pins that they should connect with this type
-                    for(int i = 0; i < m_outputs.count(); ++i) {
-                        hr = m_outputs.at(i)->setAcceptedMediaType(connectedType());
-                        if (FAILED(hr)) {
-                            break;
-                        }
-                    }
+                mt->formattype != GUID_NULL && m_output) {
+                    //we tell the output pin that it should connect with this type
+                    hr = m_output->setAcceptedMediaType(connectedType());
             }
             return hr;
         }
@@ -137,7 +125,8 @@ namespace Phonon
                 return E_POINTER;
             }
 
-            if (*alloc = memoryAllocator(true)) {
+            *alloc = memoryAllocator(true);
+            if (*alloc) {
                 return S_OK;
             }
 
@@ -151,18 +140,15 @@ namespace Phonon
             }
 
             {
-                QWriteLocker locker(&m_lock);
+                QMutexLocker locker(&m_mutex);
                 m_shouldDuplicateSamples = m_transform && readonly;
             }
 
             setMemoryAllocator(alloc);
 
-            for(int i = 0; i < m_outputs.count(); ++i) {
-                IPin *pin = m_outputs.at(i)->connected();
-                if (pin) {
-                    ComPointer<IMemInputPin> input(pin, IID_IMemInputPin);
-                    input->NotifyAllocator(alloc, m_shouldDuplicateSamples);
-                }
+            if (m_output) {
+                ComPointer<IMemInputPin> input(m_output, IID_IMemInputPin);
+                input->NotifyAllocator(alloc, m_shouldDuplicateSamples);
             }
 
             return S_OK;
@@ -201,22 +187,18 @@ namespace Phonon
                 }
             }
 
-            for (int i = 0; i < m_outputs.count(); ++i) {
-                QPin *current = m_outputs.at(i);
+            if (m_output) {
                 IMediaSample *outSample = m_shouldDuplicateSamples ?
-                    duplicateSampleForOutput(sample, current->memoryAllocator())
+                    duplicateSampleForOutput(sample, m_output->memoryAllocator())
                     : sample;
 
                 if (m_shouldDuplicateSamples) {
                     m_parent->processSample(outSample);
                 }
 
-                IPin *pin = current->connected();
-                if (pin) {
-                    ComPointer<IMemInputPin> input(pin, IID_IMemInputPin);
-                    if (input) {
-                        input->Receive(outSample);
-                    }
+                ComPointer<IMemInputPin> input(m_output->connected(), IID_IMemInputPin);
+                if (input) {
+                    input->Receive(outSample);
                 }
 
                 if (m_shouldDuplicateSamples) {
@@ -247,39 +229,16 @@ namespace Phonon
 
         STDMETHODIMP QMemInputPin::ReceiveCanBlock()
         {
-            //we test the output to see if they can block
-            for(int i = 0; i < m_outputs.count(); ++i) {
-                IPin *input = m_outputs.at(i)->connected();
-                if (input) {
-                    ComPointer<IMemInputPin> meminput(input, IID_IMemInputPin);
-                    if (meminput && meminput->ReceiveCanBlock() != S_FALSE) {
-                        return S_OK;
-                    }
+            //we test the output to see if it can block
+            if (m_output) {
+                ComPointer<IMemInputPin> meminput(m_output->connected(), IID_IMemInputPin);
+                if (meminput && meminput->ReceiveCanBlock() != S_FALSE) {
+                    return S_OK;
                 }
             }
             return S_FALSE;
         }
 
-        //addition
-        //this should be used by the filter to tell its input pins to which output they should route the samples
-
-        void QMemInputPin::addOutput(QPin *output)
-        {
-            QWriteLocker locker(&m_lock);
-            m_outputs += output;
-        }
-
-        void QMemInputPin::removeOutput(QPin *output)
-        {
-            QWriteLocker locker(&m_lock);
-            m_outputs.removeOne(output);
-        }
-
-        QList<QPin*> QMemInputPin::outputs() const
-        {
-            QReadLocker locker(&m_lock);
-            return m_outputs;
-        }
 
         ALLOCATOR_PROPERTIES QMemInputPin::getDefaultAllocatorProperties() const
         {
@@ -294,7 +253,7 @@ namespace Phonon
             LONG length = sample->GetActualDataLength();
 
             HRESULT hr = alloc->Commit();
-            if (hr == VFW_E_SIZENOTSET) {
+            if (hr == HRESULT(VFW_E_SIZENOTSET)) {
                 ALLOCATOR_PROPERTIES prop = getDefaultAllocatorProperties();
                 prop.cbBuffer = qMax(prop.cbBuffer, length);
                 ALLOCATOR_PROPERTIES actual;
@@ -324,7 +283,7 @@ namespace Phonon
             {
                 LONGLONG start, end;
                 hr = sample->GetMediaTime(&start, &end);
-                if (hr != VFW_E_MEDIA_TIME_NOT_SET) {
+                if (hr != HRESULT(VFW_E_MEDIA_TIME_NOT_SET)) {
                     hr = out->SetMediaTime(&start, &end);
                     Q_ASSERT(SUCCEEDED(hr));
                 }
diff --git a/src/3rdparty/phonon/ds9/qmeminputpin.h b/src/3rdparty/phonon/ds9/qmeminputpin.h
index c449721..d74c451 100644
--- a/src/3rdparty/phonon/ds9/qmeminputpin.h
+++ b/src/3rdparty/phonon/ds9/qmeminputpin.h
@@ -37,7 +37,7 @@ namespace Phonon
         class QMemInputPin : public QPin, public IMemInputPin
         {
         public:
-            QMemInputPin(QBaseFilter *, const QVector<AM_MEDIA_TYPE> &, bool transform);
+            QMemInputPin(QBaseFilter *, const QVector<AM_MEDIA_TYPE> &, bool transform, QPin *output);
             ~QMemInputPin();
 
             //reimplementation from IUnknown
@@ -60,18 +60,13 @@ namespace Phonon
             STDMETHODIMP ReceiveMultiple(IMediaSample **,long,long *);
             STDMETHODIMP ReceiveCanBlock();
 
-            //addition
-            void addOutput(QPin *output);
-            void removeOutput(QPin *output);
-            QList<QPin*> outputs() const;
-
         private:
             IMediaSample *duplicateSampleForOutput(IMediaSample *, IMemAllocator *);
             ALLOCATOR_PROPERTIES getDefaultAllocatorProperties() const;
 
             bool m_shouldDuplicateSamples;
             const bool m_transform; //defines if the pin is transforming the samples
-            QList<QPin*> m_outputs;
+            QPin* const m_output;
             QMutex m_mutexReceive;
         };
     }
diff --git a/src/3rdparty/phonon/ds9/qpin.cpp b/src/3rdparty/phonon/ds9/qpin.cpp
index 37fe48d..b4afd10 100644
--- a/src/3rdparty/phonon/ds9/qpin.cpp
+++ b/src/3rdparty/phonon/ds9/qpin.cpp
@@ -28,20 +28,7 @@ namespace Phonon
     namespace DS9
     {
 
-        static const AM_MEDIA_TYPE defaultMediaType()
-        {
-            AM_MEDIA_TYPE ret;
-            ret.majortype = MEDIATYPE_NULL;
-            ret.subtype = MEDIASUBTYPE_NULL;
-            ret.bFixedSizeSamples = TRUE;
-            ret.bTemporalCompression = FALSE;
-            ret.lSampleSize = 1;
-            ret.formattype = GUID_NULL;
-            ret.pUnk = 0;
-            ret.cbFormat = 0;
-            ret.pbFormat = 0;
-            return ret;
-        }
+        static const AM_MEDIA_TYPE defaultMediaType = { MEDIATYPE_NULL, MEDIASUBTYPE_NULL, TRUE, FALSE, 1, GUID_NULL, 0, 0, 0};
 
         class QEnumMediaTypes : public IEnumMediaTypes
         {
@@ -104,8 +91,8 @@ namespace Phonon
                     return E_INVALIDARG;
                 }
 
-                int nbFetched = 0;
-                while (nbFetched < int(count) && m_index < m_pin->mediaTypes().count()) {
+                uint nbFetched = 0;
+                while (nbFetched < count && m_index < m_pin->mediaTypes().count()) {
                     //the caller will deallocate the memory
                     *out = static_cast<AM_MEDIA_TYPE *>(::CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)));
                     const AM_MEDIA_TYPE original = m_pin->mediaTypes().at(m_index);
@@ -158,9 +145,9 @@ namespace Phonon
 
 
         QPin::QPin(QBaseFilter *parent, PIN_DIRECTION dir, const QVector<AM_MEDIA_TYPE> &mt) :
-        m_memAlloc(0), m_parent(parent), m_refCount(1),  m_connected(0),
-            m_direction(dir), m_mediaTypes(mt), m_connectedType(defaultMediaType()),
-            m_flushing(false)
+            m_parent(parent), m_flushing(false), m_refCount(1),  m_connected(0),
+            m_direction(dir), m_mediaTypes(mt), m_connectedType(defaultMediaType),
+            m_memAlloc(0)
         {
             Q_ASSERT(m_parent);
             m_parent->addPin(this);
@@ -273,7 +260,7 @@ namespace Phonon
 
             if (FAILED(hr)) {
                 setConnected(0);
-                setConnectedType(defaultMediaType());
+                setConnectedType(defaultMediaType);
             } else {
                 ComPointer<IMemInputPin> input(pin, IID_IMemInputPin);
                 if (input) {
@@ -315,10 +302,8 @@ namespace Phonon
             }
 
             setConnected(0);
-            setConnectedType(defaultMediaType());
-            if (m_direction == PINDIR_INPUT) {
-                setMemoryAllocator(0);
-            }
+            setConnectedType(defaultMediaType);
+            setMemoryAllocator(0);
             return S_OK;
         }
 
@@ -338,7 +323,7 @@ namespace Phonon
 
         STDMETHODIMP QPin::ConnectionMediaType(AM_MEDIA_TYPE *type)
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (!type) {
                 return E_POINTER;
             }
@@ -353,7 +338,6 @@ namespace Phonon
 
         STDMETHODIMP QPin::QueryPinInfo(PIN_INFO *info)
         {
-            QReadLocker locker(&m_lock);
             if (!info) {
                 return E_POINTER;
             }
@@ -361,14 +345,12 @@ namespace Phonon
             info->dir = m_direction;
             info->pFilter = m_parent;
             m_parent->AddRef();
-            qMemCopy(info->achName, m_name.utf16(), qMin(MAX_FILTER_NAME, m_name.length()+1) *2);
-
+            info->achName[0] = 0;
             return S_OK;
         }
 
         STDMETHODIMP QPin::QueryDirection(PIN_DIRECTION *dir)
         {
-            QReadLocker locker(&m_lock);
             if (!dir) {
                 return E_POINTER;
             }
@@ -379,20 +361,18 @@ namespace Phonon
 
         STDMETHODIMP QPin::QueryId(LPWSTR *id)
         {
-            QReadLocker locker(&m_lock);
             if (!id) {
                 return E_POINTER;
             }
 
-            int nbBytes = (m_name.length()+1)*2;
-            *id = static_cast<LPWSTR>(::CoTaskMemAlloc(nbBytes));
-            qMemCopy(*id, m_name.utf16(), nbBytes);
+            *id = static_cast<LPWSTR>(::CoTaskMemAlloc(2));
+            *id[0] = 0;
             return S_OK;
         }
 
         STDMETHODIMP QPin::QueryAccept(const AM_MEDIA_TYPE *type)
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (!type) {
                 return E_POINTER;
             }
@@ -439,7 +419,7 @@ namespace Phonon
 
         STDMETHODIMP QPin::NewSegment(REFERENCE_TIME start, REFERENCE_TIME stop, double rate)
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (m_direction == PINDIR_OUTPUT && m_connected) {
                 //we deliver this downstream
                 m_connected->NewSegment(start, stop, rate);
@@ -456,8 +436,8 @@ namespace Phonon
 
         HRESULT QPin::checkOutputMediaTypesConnection(IPin *pin)
         {
-            IEnumMediaTypes *emt = 0;
-            HRESULT hr = pin->EnumMediaTypes(&emt);
+            ComPointer<IEnumMediaTypes> emt;
+            HRESULT hr = pin->EnumMediaTypes(emt.pparam());
             if (hr != S_OK) {
                 return hr;
             }
@@ -470,7 +450,7 @@ namespace Phonon
                         freeMediaType(type);
                         return S_OK;
                     } else {
-                        setConnectedType(defaultMediaType());
+                        setConnectedType(defaultMediaType);
                         freeMediaType(type);
                     }
                 }
@@ -520,7 +500,7 @@ namespace Phonon
 
         void QPin::setConnectedType(const AM_MEDIA_TYPE &type)
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
 
             //1st we free memory
             freeMediaType(m_connectedType);
@@ -530,13 +510,13 @@ namespace Phonon
 
         const AM_MEDIA_TYPE &QPin::connectedType() const 
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             return m_connectedType;
         }
 
         void QPin::setConnected(IPin *pin)
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (pin) {
                 pin->AddRef();
             }
@@ -548,7 +528,7 @@ namespace Phonon
 
         IPin *QPin::connected(bool addref) const
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (addref && m_connected) {
                 m_connected->AddRef();
             }
@@ -557,13 +537,12 @@ namespace Phonon
 
         bool QPin::isFlushing() const
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             return m_flushing;
         }
 
         FILTER_STATE QPin::filterState() const
         {
-            QReadLocker locker(&m_lock);
             FILTER_STATE fstate = State_Stopped;
             m_parent->GetState(0, &fstate);
             return fstate;
@@ -571,7 +550,7 @@ namespace Phonon
 
         QVector<AM_MEDIA_TYPE> QPin::mediaTypes() const
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             return m_mediaTypes;
         }
 
@@ -607,7 +586,7 @@ namespace Phonon
 
         void QPin::setMemoryAllocator(IMemAllocator *alloc)
         {
-            QWriteLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (alloc) {
                 alloc->AddRef();
             }
@@ -619,7 +598,7 @@ namespace Phonon
 
         IMemAllocator *QPin::memoryAllocator(bool addref) const
         {
-            QReadLocker locker(&m_lock);
+            QMutexLocker locker(&m_mutex);
             if (addref && m_memAlloc) {
                 m_memAlloc->AddRef();
             }
diff --git a/src/3rdparty/phonon/ds9/qpin.h b/src/3rdparty/phonon/ds9/qpin.h
index a3287c4..280ad61 100644
--- a/src/3rdparty/phonon/ds9/qpin.h
+++ b/src/3rdparty/phonon/ds9/qpin.h
@@ -22,7 +22,7 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QtCore/QString>
 #include <QtCore/QVector>
-#include <QtCore/QReadWriteLock>
+#include <QtCore/QMutex>
 
 #include <dshow.h>
 
@@ -85,8 +85,8 @@ namespace Phonon
 
         protected:
             //this can be used by sub-classes
-            mutable QReadWriteLock m_lock;
-            QBaseFilter *m_parent;
+            mutable QMutex m_mutex;
+            QBaseFilter * const m_parent;
             bool m_flushing;
 
         private:
@@ -98,7 +98,6 @@ namespace Phonon
             const PIN_DIRECTION m_direction;
             QVector<AM_MEDIA_TYPE> m_mediaTypes; //accepted media types
             AM_MEDIA_TYPE m_connectedType;
-            QString m_name;
             IMemAllocator *m_memAlloc;
         };
 
diff --git a/src/3rdparty/phonon/ds9/videorenderer_default.cpp b/src/3rdparty/phonon/ds9/videorenderer_default.cpp
new file mode 100644
index 0000000..0045a49
--- /dev/null
+++ b/src/3rdparty/phonon/ds9/videorenderer_default.cpp
@@ -0,0 +1,153 @@
+/*  This file is part of the KDE project.
+
+Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2.1 or 3 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "videorenderer_default.h"
+
+#ifndef QT_NO_PHONON_VIDEO
+
+#include <QtGui/QWidget>
+#include <QtGui/QPainter>
+
+#include <uuids.h>
+
+QT_BEGIN_NAMESPACE
+
+
+namespace Phonon
+{
+    namespace DS9
+    {
+        VideoRendererDefault::~VideoRendererDefault()
+        {
+        }
+
+        bool VideoRendererDefault::isNative() const
+        {
+            return true;
+        }
+
+
+        VideoRendererDefault::VideoRendererDefault(QWidget *target) : m_target(target)
+        {
+            m_target->setAttribute(Qt::WA_PaintOnScreen, true);
+            m_filter = Filter(CLSID_VideoRenderer, IID_IBaseFilter);
+        }
+
+        QSize VideoRendererDefault::videoSize() const
+        {
+            LONG w = 0,
+                h = 0;
+            ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
+            if (basic) {
+                basic->GetVideoSize( &w, &h);
+            }
+            return QSize(w, h);
+        }
+
+        void VideoRendererDefault::repaintCurrentFrame(QWidget * /*target*/, const QRect & /*rect*/)
+        {
+            //nothing to do here: the renderer paints everything
+        }
+
+        void VideoRendererDefault::notifyResize(const QSize &size, Phonon::VideoWidget::AspectRatio aspectRatio,
+            Phonon::VideoWidget::ScaleMode scaleMode)
+        {
+            if (!isActive()) {
+                ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
+                if (basic) {
+                    basic->SetDestinationPosition(0, 0, 0, 0);
+                }
+                return;
+            }
+
+            ComPointer<IVideoWindow> video(m_filter, IID_IVideoWindow);
+
+            OAHWND owner;
+            HRESULT hr = video->get_Owner(&owner);
+            if (FAILED(hr)) {
+                return;
+            }
+
+            const OAHWND newOwner = reinterpret_cast<OAHWND>(m_target->winId());
+            if (owner != newOwner) {
+                video->put_Owner(newOwner);
+                video->put_MessageDrain(newOwner);
+                video->put_WindowStyle(WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
+            }
+
+            //make sure the widget takes the whole size of the parent
+            video->SetWindowPosition(0, 0, size.width(), size.height());
+
+            const QSize vsize = videoSize();
+            internalNotifyResize(size, vsize, aspectRatio, scaleMode);
+
+            ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
+            if (basic) {
+                basic->SetDestinationPosition(m_dstX, m_dstY, m_dstWidth, m_dstHeight);
+            }
+        }
+
+        void VideoRendererDefault::applyMixerSettings(qreal /*brightness*/, qreal /*contrast*/, qreal /*m_hue*/, qreal /*saturation*/)
+        {
+            //this can't be supported for the default renderer
+        }
+
+        QImage VideoRendererDefault::snapshot() const
+        {
+            ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
+            if (basic) {
+                LONG bufferSize = 0;
+                //1st we get the buffer size
+                basic->GetCurrentImage(&bufferSize, 0);
+
+                QByteArray buffer;
+                buffer.resize(bufferSize);
+                HRESULT hr = basic->GetCurrentImage(&bufferSize, reinterpret_cast<long*>(buffer.data()));
+
+                if (SUCCEEDED(hr)) {
+
+                    const BITMAPINFOHEADER  *bmi = reinterpret_cast<const BITMAPINFOHEADER*>(buffer.constData());
+
+                    const int w = qAbs(bmi->biWidth),
+                        h = qAbs(bmi->biHeight);
+
+                    // Create image and copy data into image.
+                    QImage ret(w, h, QImage::Format_RGB32);
+
+                    if (!ret.isNull()) {
+                        const char *data = buffer.constData() + bmi->biSize;
+                        const int bytes_per_line = w * sizeof(QRgb);
+                        for (int y = h - 1; y >= 0; --y) {
+                            qMemCopy(ret.scanLine(y), //destination
+                                data,     //source
+                                bytes_per_line);
+                            data += bytes_per_line;
+                        }
+                    }
+                    return ret;
+                }
+            }
+            return QImage();
+        }
+
+    }
+}
+
+QT_END_NAMESPACE
+
+#endif //QT_NO_PHONON_VIDEO
diff --git a/src/3rdparty/phonon/ds9/videorenderer_default.h b/src/3rdparty/phonon/ds9/videorenderer_default.h
new file mode 100644
index 0000000..43768d9
--- /dev/null
+++ b/src/3rdparty/phonon/ds9/videorenderer_default.h
@@ -0,0 +1,55 @@
+/*  This file is part of the KDE project.
+
+Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2.1 or 3 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PHONON_VIDEORENDERER_DEFAULT_H
+#define PHONON_VIDEORENDERER_DEFAULT_H
+
+#include "abstractvideorenderer.h"
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_NO_PHONON_VIDEO
+
+namespace Phonon
+{
+    namespace DS9
+    {
+        class VideoRendererDefault : public AbstractVideoRenderer
+        {
+        public:
+            VideoRendererDefault(QWidget *target);
+            ~VideoRendererDefault();
+
+            //Implementation from AbstractVideoRenderer
+            void repaintCurrentFrame(QWidget *target, const QRect &rect);
+            void notifyResize(const QSize&, Phonon::VideoWidget::AspectRatio, Phonon::VideoWidget::ScaleMode);
+            QSize videoSize() const;
+            QImage snapshot() const;
+            void applyMixerSettings(qreal brightness, qreal contrast, qreal m_hue, qreal saturation);
+            bool isNative() const;
+        private:
+            QWidget *m_target;
+        };
+    }
+}
+
+#endif //QT_NO_PHONON_VIDEO
+
+QT_END_NAMESPACE
+
+#endif
+
diff --git a/src/3rdparty/phonon/ds9/videorenderer_evr.cpp b/src/3rdparty/phonon/ds9/videorenderer_evr.cpp
new file mode 100644
index 0000000..d23d9ce
--- /dev/null
+++ b/src/3rdparty/phonon/ds9/videorenderer_evr.cpp
@@ -0,0 +1,215 @@
+/*  This file is part of the KDE project.
+
+Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2.1 or 3 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#include "videorenderer_evr.h"
+#include "qevr9.h"
+
+#ifndef QT_NO_PHONON_VIDEO
+
+#include <QtGui/QWidget>
+#include <QtGui/QPainter>
+
+QT_BEGIN_NAMESPACE
+
+namespace Phonon
+{
+    namespace DS9
+    {
+        //we have to define them here because not all compilers/sdk have them
+        static const GUID MR_VIDEO_RENDER_SERVICE =     {0x1092a86c, 0xab1a, 0x459a, {0xa3, 0x36, 0x83, 0x1f, 0xbc, 0x4d, 0x11, 0xff} };
+        static const GUID MR_VIDEO_MIXER_SERVICE =      { 0x73cd2fc, 0x6cf4, 0x40b7, {0x88, 0x59, 0xe8, 0x95, 0x52, 0xc8, 0x41, 0xf8} };
+        static const IID IID_IMFVideoDisplayControl =   {0xa490b1e4, 0xab84, 0x4d31, {0xa1, 0xb2, 0x18, 0x1e, 0x03, 0xb1, 0x07, 0x7a} };
+        static const IID IID_IMFVideoMixerControl =     {0xA5C6C53F, 0xC202, 0x4aa5, {0x96, 0x95, 0x17, 0x5B, 0xA8, 0xC5, 0x08, 0xA5} };
+        static const IID IID_IMFVideoProcessor =        {0x6AB0000C, 0xFECE, 0x4d1f, {0xA2, 0xAC, 0xA9, 0x57, 0x35, 0x30, 0x65, 0x6E} };
+        static const IID IID_IMFGetService =            {0xFA993888, 0x4383, 0x415A, {0xA9, 0x30, 0xDD, 0x47, 0x2A, 0x8C, 0xF6, 0xF7} };
+        static const GUID CLSID_EnhancedVideoRenderer = {0xfa10746c, 0x9b63, 0x4b6c, {0xbc, 0x49, 0xfc, 0x30,  0xe, 0xa5, 0xf2, 0x56} };
+
+        template <typename T> ComPointer<T> getService(const Filter &filter, REFGUID guidService, REFIID riid)
+        {
+            //normally we should use IID_IMFGetService but this introduces another dependency
+            //so here we simply define our own IId with the same value
+            ComPointer<IMFGetService> getService(filter, IID_IMFGetService);
+            Q_ASSERT(getService);
+            T *ptr = 0;
+            HRESULT hr = getService->GetService(guidService, riid, reinterpret_cast<void **>(&ptr));
+            if (!SUCCEEDED(hr) || ptr == 0)
+                Q_ASSERT(!SUCCEEDED(hr) && ptr != 0);
+            ComPointer<T> service(ptr);
+            return service;
+        }
+
+        VideoRendererEVR::~VideoRendererEVR()
+        {
+        }
+
+        bool VideoRendererEVR::isNative() const
+        {
+            return true;
+        }
+
+        VideoRendererEVR::VideoRendererEVR(QWidget *target) : m_target(target)
+        {
+            m_filter = Filter(CLSID_EnhancedVideoRenderer, IID_IBaseFilter);
+            if (!m_filter) {
+                return;
+            }
+
+            ComPointer<IMFVideoDisplayControl> filterControl = getService<IMFVideoDisplayControl>(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl);
+
+            filterControl->SetVideoWindow(reinterpret_cast<HWND>(target->winId()));
+            filterControl->SetAspectRatioMode(MFVideoARMode_None); // We're in control of the size
+        }
+
+        QImage VideoRendererEVR::snapshot() const
+        {
+            // This will always capture black areas where no video is drawn, if any are present.
+            // Due to the hack in notifyResize()
+            ComPointer<IMFVideoDisplayControl> filterControl = getService<IMFVideoDisplayControl>(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl);
+            if (filterControl) {
+                BITMAPINFOHEADER bmi;
+                BYTE *buffer = 0;
+                DWORD bufferSize;
+                LONGLONG timeStamp;
+
+                bmi.biSize = sizeof(BITMAPINFOHEADER);
+
+                HRESULT hr = filterControl->GetCurrentImage(&bmi, &buffer, &bufferSize, &timeStamp);
+                if (SUCCEEDED(hr)) {
+
+                    const int w = qAbs(bmi.biWidth),
+                        h = qAbs(bmi.biHeight);
+
+                    // Create image and copy data into image.
+                    QImage ret(w, h, QImage::Format_RGB32);
+
+                    if (!ret.isNull()) {
+                        uchar *data = buffer;
+                        const int bytes_per_line = w * sizeof(QRgb);
+                        for (int y = h - 1; y >= 0; --y) {
+                            qMemCopy(ret.scanLine(y), //destination
+                                data,     //source
+                                bytes_per_line);
+                            data += bytes_per_line;
+                        }
+                    }
+                    ::CoTaskMemFree(buffer);
+                    return ret;
+                }
+            }
+            return QImage();
+        }
+
+        QSize VideoRendererEVR::videoSize() const
+        {
+            SIZE nativeSize;
+            SIZE aspectRatioSize;
+
+            ComPointer<IMFVideoDisplayControl> filterControl = getService<IMFVideoDisplayControl>(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl);
+
+            filterControl->GetNativeVideoSize(&nativeSize, &aspectRatioSize);
+
+            return QSize(nativeSize.cx, nativeSize.cy);
+        }
+       
+        void VideoRendererEVR::repaintCurrentFrame(QWidget *target, const QRect &rect)
+        {
+            // repaint the video
+            ComPointer<IMFVideoDisplayControl> filterControl = getService<IMFVideoDisplayControl>(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl);
+            // All failed results can be safely ignored
+            filterControl->RepaintVideo();
+        }
+
+        void VideoRendererEVR::notifyResize(const QSize &size, Phonon::VideoWidget::AspectRatio aspectRatio,
+            Phonon::VideoWidget::ScaleMode scaleMode)
+        {
+            if (!isActive()) {
+                RECT dummyRect = { 0, 0, 0, 0};
+                ComPointer<IMFVideoDisplayControl> filterControl = getService<IMFVideoDisplayControl>(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl);
+                filterControl->SetVideoPosition(0, &dummyRect);
+                return;
+            }
+
+            const QSize vsize = videoSize();
+            internalNotifyResize(size, vsize, aspectRatio, scaleMode);
+
+            RECT dstRectWin = { 0, 0, size.width(), size.height()};
+
+            // Resize the Stream output rect instead of the destination rect.
+            // Hacky workaround for flicker in the areas outside of the destination rect
+            // This way these areas don't exist
+            MFVideoNormalizedRect streamOutputRect = { float(m_dstX) / float(size.width()), float(m_dstY) / float(size.height()),
+                                                       float(m_dstWidth + m_dstX) / float(size.width()), float(m_dstHeight + m_dstY) / float(size.height())};
+
+            ComPointer<IMFVideoMixerControl> filterMixer = getService<IMFVideoMixerControl>(m_filter, MR_VIDEO_MIXER_SERVICE, IID_IMFVideoMixerControl);
+            ComPointer<IMFVideoDisplayControl> filterControl = getService<IMFVideoDisplayControl>(m_filter, MR_VIDEO_RENDER_SERVICE, IID_IMFVideoDisplayControl);
+
+            filterMixer->SetStreamOutputRect(0, &streamOutputRect);
+            filterControl->SetVideoPosition(0, &dstRectWin);
+        }
+
+        void VideoRendererEVR::applyMixerSettings(qreal brightness, qreal contrast, qreal hue, qreal saturation)
+        {
+            InputPin sink = BackendNode::pins(m_filter, PINDIR_INPUT).first();
+            OutputPin source;
+            if (FAILED(sink->ConnectedTo(source.pparam()))) {
+                return; //it must be connected to work
+            }
+
+            // Get the "Video Processor" (used for brightness/contrast/saturation/hue)
+            ComPointer<IMFVideoProcessor> processor = getService<IMFVideoProcessor>(m_filter, MR_VIDEO_MIXER_SERVICE, IID_IMFVideoProcessor);
+            Q_ASSERT(processor);
+
+            DXVA2_ValueRange contrastRange;
+            DXVA2_ValueRange brightnessRange;
+            DXVA2_ValueRange saturationRange;
+            DXVA2_ValueRange hueRange;
+
+            if (FAILED(processor->GetProcAmpRange(DXVA2_ProcAmp_Contrast, &contrastRange)))
+                return;
+            if (FAILED(processor->GetProcAmpRange(DXVA2_ProcAmp_Brightness, &brightnessRange)))
+                return;
+            if (FAILED(processor->GetProcAmpRange(DXVA2_ProcAmp_Saturation, &saturationRange)))
+                return;
+            if (FAILED(processor->GetProcAmpRange(DXVA2_ProcAmp_Hue, &hueRange)))
+                return;
+
+            DXVA2_ProcAmpValues values;
+
+            values.Contrast = DXVA2FloatToFixed(((contrast < 0
+                                ? DXVA2FixedToFloat(contrastRange.MinValue) : DXVA2FixedToFloat(contrastRange.MaxValue))
+                               - DXVA2FixedToFloat(contrastRange.DefaultValue)) * qAbs(contrast) + DXVA2FixedToFloat(contrastRange.DefaultValue));
+            values.Brightness = DXVA2FloatToFixed(((brightness < 0
+                                ? DXVA2FixedToFloat(brightnessRange.MinValue) : DXVA2FixedToFloat(brightnessRange.MaxValue))
+                               - DXVA2FixedToFloat(brightnessRange.DefaultValue)) * qAbs(brightness) + DXVA2FixedToFloat(brightnessRange.DefaultValue));
+            values.Saturation = DXVA2FloatToFixed(((saturation < 0
+                                ? DXVA2FixedToFloat(saturationRange.MinValue) : DXVA2FixedToFloat(saturationRange.MaxValue))
+                               - DXVA2FixedToFloat(saturationRange.DefaultValue)) * qAbs(saturation) + DXVA2FixedToFloat(saturationRange.DefaultValue));
+            values.Hue = DXVA2FloatToFixed(((hue < 0
+                                ? DXVA2FixedToFloat(hueRange.MinValue) : DXVA2FixedToFloat(hueRange.MaxValue))
+                               - DXVA2FixedToFloat(hueRange.DefaultValue)) * qAbs(hue) + DXVA2FixedToFloat(hueRange.DefaultValue));
+
+            //finally set the settings
+            processor->SetProcAmpValues(DXVA2_ProcAmp_Contrast | DXVA2_ProcAmp_Brightness | DXVA2_ProcAmp_Saturation | DXVA2_ProcAmp_Hue, &values);
+
+        }
+    }
+}
+
+QT_END_NAMESPACE
+
+#endif //QT_NO_PHONON_VIDEO
diff --git a/src/3rdparty/phonon/ds9/videorenderer_evr.h b/src/3rdparty/phonon/ds9/videorenderer_evr.h
new file mode 100644
index 0000000..229c36d
--- /dev/null
+++ b/src/3rdparty/phonon/ds9/videorenderer_evr.h
@@ -0,0 +1,56 @@
+/*  This file is part of the KDE project.
+
+Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation, either version 2.1 or 3 of the License.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License
+along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef PHONON_VIDEORENDERER_EVR_H
+#define PHONON_VIDEORENDERER_EVR_H
+
+#include "abstractvideorenderer.h"
+#include "compointer.h"
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_NO_PHONON_VIDEO
+
+namespace Phonon
+{
+    namespace DS9
+    {
+        class VideoRendererEVR : public AbstractVideoRenderer
+        {
+        public:
+            VideoRendererEVR(QWidget *target);
+            ~VideoRendererEVR();
+
+            //Implementation from AbstractVideoRenderer
+            void repaintCurrentFrame(QWidget *target, const QRect &rect);
+            void notifyResize(const QSize&, Phonon::VideoWidget::AspectRatio, Phonon::VideoWidget::ScaleMode);
+            QSize videoSize() const;
+            QImage snapshot() const;
+            void applyMixerSettings(qreal brightness, qreal contrast, qreal m_hue, qreal saturation);
+            bool isNative() const;
+        private:
+            QWidget *m_target;
+        };
+    }
+}
+
+#endif //QT_NO_PHONON_VIDEO
+
+QT_END_NAMESPACE
+
+#endif
+
diff --git a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp
index 491d1bd..9c7993c 100644
--- a/src/3rdparty/phonon/ds9/videorenderer_soft.cpp
+++ b/src/3rdparty/phonon/ds9/videorenderer_soft.cpp
@@ -194,8 +194,8 @@ namespace Phonon
                 m_sampleBuffer = ComPointer<IMediaSample>();
 #ifndef QT_NO_OPENGL
                 freeGLResources();
-#endif // QT_NO_OPENGL
                 m_textureUploaded = false;
+#endif // QT_NO_OPENGL
             }
 
             void endOfStream()
@@ -314,7 +314,6 @@ namespace Phonon
             REFERENCE_TIME m_start;
             HANDLE m_renderEvent, m_receiveCanWait;         // Signals sample to render
             QSize m_size;
-            bool m_textureUploaded;
 
             //mixer settings
             qreal m_brightness,
@@ -356,6 +355,7 @@ namespace Phonon
 
             bool m_checkedPrograms;
             bool m_usingOpenGL;
+            bool m_textureUploaded;
             GLuint m_program[2];
             GLuint m_texture[3];
 #endif
@@ -365,7 +365,7 @@ namespace Phonon
         {
         public:
             VideoRendererSoftPin(VideoRendererSoftFilter *parent) :
-              QMemInputPin(parent, videoMediaTypes(), false /*no transformation of the samples*/),
+              QMemInputPin(parent, videoMediaTypes(), false /*no transformation of the samples*/, 0),
                   m_renderer(parent)
               {
               }
@@ -436,7 +436,7 @@ namespace Phonon
         QBaseFilter(CLSID_NULL), m_inputPin(new VideoRendererSoftPin(this)),
             m_renderer(renderer), m_start(0)
 #ifndef QT_NO_OPENGL
-            ,m_usingOpenGL(false), m_checkedPrograms(false), m_textureUploaded(false)
+            , m_checkedPrograms(false), m_usingOpenGL(false), m_textureUploaded(false)
 #endif
         {
             m_renderEvent    = ::CreateEvent(0, 0, 0, 0);
@@ -661,7 +661,10 @@ namespace Phonon
 
 
 #ifndef QT_NO_OPENGL
-            if (painter.paintEngine() && painter.paintEngine()->type() == QPaintEngine::OpenGL && checkGLPrograms()) {
+            if (painter.paintEngine() && 
+                (painter.paintEngine()->type() == QPaintEngine::OpenGL || painter.paintEngine()->type() == QPaintEngine::OpenGL2)
+                && checkGLPrograms()) {
+
                 //for now we only support YUV (both YV12 and YUY2)
                 updateTexture();
 
@@ -673,6 +676,7 @@ namespace Phonon
                 }
 
                 //let's draw the texture
+                painter.beginNativePainting();
 
                 //Let's pass the other arguments
                 const Program prog = (m_inputPin->connectedType().subtype == MEDIASUBTYPE_YV12) ? YV12toRGB : YUY2toRGB;
@@ -722,6 +726,7 @@ namespace Phonon
                 glDisableClientState(GL_VERTEX_ARRAY);
 
                 glDisable(GL_FRAGMENT_PROGRAM_ARB);
+                painter.endNativePainting();
                 return;
             } else
 #endif
diff --git a/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp b/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp
index 298e9fa..545b31e 100644
--- a/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp
+++ b/src/3rdparty/phonon/ds9/videorenderer_vmr9.cpp
@@ -22,14 +22,9 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QtGui/QWidget>
 #include <QtGui/QPainter>
-#include <QtCore/QTimerEvent>
 
-#ifndef Q_OS_WINCE
 #include <d3d9.h>
 #include <vmr9.h>
-#else
-#include <uuids.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -48,116 +43,10 @@ namespace Phonon
         }
 
 
-#ifdef Q_OS_WINCE
-        VideoRendererVMR9::VideoRendererVMR9(QWidget *target) : m_target(target)
-        {
-            m_target->setAttribute(Qt::WA_PaintOnScreen, true);
-            m_filter = Filter(CLSID_VideoRenderer, IID_IBaseFilter);
-        }
-
-        QSize VideoRendererVMR9::videoSize() const
-        {
-            LONG w = 0,
-                h = 0;
-            ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
-            if (basic) {
-                basic->GetVideoSize( &w, &h);
-            }
-            return QSize(w, h);
-        }
-
-        void VideoRendererVMR9::repaintCurrentFrame(QWidget * /*target*/, const QRect & /*rect*/)
-        {
-            //nothing to do here: the renderer paints everything
-        }
-
-        void VideoRendererVMR9::notifyResize(const QSize &size, Phonon::VideoWidget::AspectRatio aspectRatio,
-            Phonon::VideoWidget::ScaleMode scaleMode)
-        {
-            if (!isActive()) {
-                ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
-                if (basic) {
-                    basic->SetDestinationPosition(0, 0, 0, 0);
-                }
-                return;
-            }
-
-            ComPointer<IVideoWindow> video(m_filter, IID_IVideoWindow);
-
-            OAHWND owner;
-            HRESULT hr = video->get_Owner(&owner);
-            if (FAILED(hr)) {
-                return;
-            }
-
-            const OAHWND newOwner = reinterpret_cast<OAHWND>(m_target->winId());
-            if (owner != newOwner) {
-                video->put_Owner(newOwner);
-                video->put_MessageDrain(newOwner);
-                video->put_WindowStyle(WS_CHILD | WS_CLIPCHILDREN | WS_CLIPSIBLINGS);
-            }
-
-            //make sure the widget takes the whole size of the parent
-            video->SetWindowPosition(0, 0, size.width(), size.height());
-
-            const QSize vsize = videoSize();
-            internalNotifyResize(size, vsize, aspectRatio, scaleMode);
-
-            ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
-            if (basic) {
-                basic->SetDestinationPosition(m_dstX, m_dstY, m_dstWidth, m_dstHeight);
-            }
-        }
-
-        void VideoRendererVMR9::applyMixerSettings(qreal /*brightness*/, qreal /*contrast*/, qreal /*m_hue*/, qreal /*saturation*/)
-        {
-            //this can't be supported for WinCE
-        }
-
-        QImage VideoRendererVMR9::snapshot() const
-        {
-            ComPointer<IBasicVideo> basic(m_filter, IID_IBasicVideo);
-            if (basic) {
-                LONG bufferSize = 0;
-                //1st we get the buffer size
-                basic->GetCurrentImage(&bufferSize, 0);
-
-                QByteArray buffer;
-                buffer.resize(bufferSize);
-                HRESULT hr = basic->GetCurrentImage(&bufferSize, reinterpret_cast<long*>(buffer.data()));
-
-                if (SUCCEEDED(hr)) {
-
-                    const BITMAPINFOHEADER  *bmi = reinterpret_cast<const BITMAPINFOHEADER*>(buffer.constData());
-
-                    const int w = qAbs(bmi->biWidth),
-                        h = qAbs(bmi->biHeight);
-
-                    // Create image and copy data into image.
-                    QImage ret(w, h, QImage::Format_RGB32);
-
-                    if (!ret.isNull()) {
-                        const char *data = buffer.constData() + bmi->biSize;
-                        const int bytes_per_line = w * sizeof(QRgb);
-                        for (int y = h - 1; y >= 0; --y) {
-                            qMemCopy(ret.scanLine(y), //destination
-                                data,     //source
-                                bytes_per_line);
-                            data += bytes_per_line;
-                        }
-                    }
-                    return ret;
-                }
-            }
-            return QImage();
-        }
-
-#else
         VideoRendererVMR9::VideoRendererVMR9(QWidget *target) : m_target(target)
         {
             m_filter = Filter(CLSID_VideoMixingRenderer9, IID_IBaseFilter);
             if (!m_filter) {
-                qWarning("the video widget could not be initialized correctly");
                 return;
             }
 
@@ -169,6 +58,7 @@ namespace Phonon
             Q_ASSERT(SUCCEEDED(hr));
             ComPointer<IVMRWindowlessControl9> windowlessControl(m_filter, IID_IVMRWindowlessControl9);
             windowlessControl->SetVideoClippingWindow(reinterpret_cast<HWND>(target->winId()));
+            windowlessControl->SetAspectRatioMode(VMR9ARMode_None); //we're in control of the size
         }
 
         QImage VideoRendererVMR9::snapshot() const
@@ -324,7 +214,6 @@ namespace Phonon
             //finally set the settings
             mixer->SetProcAmpControl(0, &ctrl);
         }
-#endif
     }
 }
 
diff --git a/src/3rdparty/phonon/ds9/videorenderer_vmr9.h b/src/3rdparty/phonon/ds9/videorenderer_vmr9.h
index 4eb237e..516d79d 100644
--- a/src/3rdparty/phonon/ds9/videorenderer_vmr9.h
+++ b/src/3rdparty/phonon/ds9/videorenderer_vmr9.h
@@ -19,7 +19,6 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 #define PHONON_VIDEORENDERER_VMR9_H
 
 #include "abstractvideorenderer.h"
-#include "compointer.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/3rdparty/phonon/ds9/videowidget.cpp b/src/3rdparty/phonon/ds9/videowidget.cpp
index de7ce5f..09d42a4 100644
--- a/src/3rdparty/phonon/ds9/videowidget.cpp
+++ b/src/3rdparty/phonon/ds9/videowidget.cpp
@@ -24,7 +24,12 @@ along with this library.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "mediaobject.h"
 
+#ifndef Q_OS_WINCE
+#include "videorenderer_evr.h"
 #include "videorenderer_vmr9.h"
+#else
+#include "videorenderer_default.h"
+#endif
 #include "videorenderer_soft.h"
 
 QT_BEGIN_NAMESPACE
@@ -84,7 +89,19 @@ namespace Phonon
             void setCurrentRenderer(AbstractVideoRenderer *renderer)
             {
                 m_currentRenderer = renderer;
-                update();
+                //we disallow repaint on that widget for just a fraction of second
+                //this allows better transition between videos
+                setUpdatesEnabled(false);
+                m_flickerFreeTimer.start(20, this);
+            }
+
+            void timerEvent(QTimerEvent *e)
+            {
+                if (e->timerId() == m_flickerFreeTimer.timerId()) {
+                    m_flickerFreeTimer.stop();
+                    setUpdatesEnabled(true);
+                }
+                QWidget::timerEvent(e);
             }
 
             QSize sizeHint() const
@@ -106,6 +123,8 @@ namespace Phonon
 
             void paintEvent(QPaintEvent *e)
             {
+                if (!updatesEnabled())
+                    return; //this avoids repaint from native events
                 checkCurrentRenderingMode();
                 m_currentRenderer->repaintCurrentFrame(this, e->rect());
             }
@@ -153,13 +172,14 @@ namespace Phonon
                     }
                 } else if (!isEmbedded()) {
                     m_currentRenderer = m_node->switchRendering(m_currentRenderer);
-                    setAttribute(Qt::WA_PaintOnScreen, true);
+                    setAttribute(Qt::WA_PaintOnScreen, false);
                 }
             }
 
             VideoWidget *m_node;
             AbstractVideoRenderer *m_currentRenderer;
             QVariant m_restoreScreenSaverActive;
+            QBasicTimer m_flickerFreeTimer;
         };
 
         VideoWidget::VideoWidget(QWidget *parent)
@@ -203,6 +223,9 @@ namespace Phonon
             if (toNative && m_noNativeRendererSupported)
                 return current; //no switch here
 
+            if (!mediaObject())
+                return current;
+
             //firt we delete the renderer
             //initialization of the widgets
             for(int i = 0; i < FILTER_COUNT; ++i) {
@@ -261,6 +284,7 @@ namespace Phonon
         {
             m_aspectRatio = aspectRatio;
             updateVideoSize();
+            m_widget->update();
         }
 
         Phonon::VideoWidget::ScaleMode VideoWidget::scaleMode() const
@@ -279,6 +303,7 @@ namespace Phonon
         {
             m_scaleMode = scaleMode;
             updateVideoSize();
+            m_widget->update();
         }
 
         void VideoWidget::setBrightness(qreal b)
@@ -332,14 +357,29 @@ namespace Phonon
             int index = graphIndex * 2 + type;
             if (m_renderers[index] == 0 && autoCreate) {
                 AbstractVideoRenderer *renderer = 0;
-				if (type == Native) {
-                    renderer = new VideoRendererVMR9(m_widget);
+                if (type == Native) {
+#ifndef Q_OS_WINCE
+                    renderer = new VideoRendererEVR(m_widget);
+                    if (renderer->getFilter() == 0) {
+                        delete renderer;
+                        //EVR not present, let's try VMR
+                        renderer = new VideoRendererVMR9(m_widget);
+                        if (renderer->getFilter() == 0) {
+                            //instanciating the renderer might fail
+                            m_noNativeRendererSupported = true;
+                            delete renderer;
+                            renderer = 0;
+                        }
+                    }
+#else
+                    renderer = new VideoRendererDefault(m_widget);
                     if (renderer->getFilter() == 0) {
-                        //instanciating the renderer might fail with error VFW_E_DDRAW_CAPS_NOT_SUITABLE (0x80040273)
+                        //instanciating the renderer might fail
                         m_noNativeRendererSupported = true;
                         delete renderer;
                         renderer = 0;
                     }
+#endif
                 }
 
                 if (renderer == 0) {
diff --git a/src/3rdparty/phonon/ds9/volumeeffect.cpp b/src/3rdparty/phonon/ds9/volumeeffect.cpp
index b9a5fce..a93b074 100644
--- a/src/3rdparty/phonon/ds9/volumeeffect.cpp
+++ b/src/3rdparty/phonon/ds9/volumeeffect.cpp
@@ -76,7 +76,7 @@ namespace Phonon
         class VolumeMemInputPin : public QMemInputPin
         {
         public:
-            VolumeMemInputPin(QBaseFilter *parent, const QVector<AM_MEDIA_TYPE> &mt) : QMemInputPin(parent, mt, true /*transform*/)
+            VolumeMemInputPin(QBaseFilter *parent, const QVector<AM_MEDIA_TYPE> &mt, QPin *output) : QMemInputPin(parent, mt, true /*transform*/, output)
             {
             }
 
@@ -139,8 +139,7 @@ namespace Phonon
 
             //then creating the input
             mt << audioMediaType();
-            m_input = new VolumeMemInputPin(this, mt);
-            m_input->addOutput(m_output); //make the connection here
+            m_input = new VolumeMemInputPin(this, mt, m_output);
         }
 
         void VolumeEffectFilter::treatOneSamplePerChannel(BYTE **buffer, int sampleSize, int channelCount, int frequency)
diff --git a/src/3rdparty/phonon/ds9/volumeeffect.h b/src/3rdparty/phonon/ds9/volumeeffect.h
index 39b20d0..d1b0186 100644
--- a/src/3rdparty/phonon/ds9/volumeeffect.h
+++ b/src/3rdparty/phonon/ds9/volumeeffect.h
@@ -47,7 +47,7 @@ namespace Phonon
         private:
             float m_volume;
 
-            //parameters used to fade
+            //paramaters used to fade
             Phonon::VolumeFaderEffect::FadeCurve m_fadeCurve;
 
             bool m_fading; //determines if we should be fading.
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
index 544762a..6356c21 100644
--- a/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
+++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
@@ -369,6 +369,13 @@ void MMF::AbstractMediaPlayer::playbackComplete(int error)
 {
     stopTimers();
 
+    if (KErrNone == error && !m_aboutToFinishSent) {
+        const qint64 total = totalTime();
+        emit MMF::AbstractPlayer::tick(total);
+        m_aboutToFinishSent = true;
+        emit aboutToFinish();
+    }
+
     if (KErrNone == error) {
         changeState(StoppedState);
 
@@ -393,15 +400,13 @@ qint64 MMF::AbstractMediaPlayer::toMilliSeconds(const TTimeIntervalMicroSeconds
 
 void MMF::AbstractMediaPlayer::positionTick()
 {
-    emitMarksIfReached();
-
     const qint64 current = currentTime();
+    emitMarksIfReached(current);
     emit MMF::AbstractPlayer::tick(current);
 }
 
-void MMF::AbstractMediaPlayer::emitMarksIfReached()
+void MMF::AbstractMediaPlayer::emitMarksIfReached(qint64 current)
 {
-    const qint64 current = currentTime();
     const qint64 total = totalTime();
     const qint64 remaining = total - current;
 
diff --git a/src/3rdparty/phonon/mmf/abstractmediaplayer.h b/src/3rdparty/phonon/mmf/abstractmediaplayer.h
index abd6bff..308b5af 100644
--- a/src/3rdparty/phonon/mmf/abstractmediaplayer.h
+++ b/src/3rdparty/phonon/mmf/abstractmediaplayer.h
@@ -91,7 +91,7 @@ private:
     void stopBufferStatusTimer();
     void stopTimers();
     void doVolumeChanged();
-    void emitMarksIfReached();
+    void emitMarksIfReached(qint64 position);
     void resetMarksIfRewound();
 
 private Q_SLOTS:
diff --git a/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp b/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp
index 226d079..d607f1d 100644
--- a/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp
+++ b/src/3rdparty/phonon/mmf/videoplayer_dsa.cpp
@@ -217,7 +217,7 @@ void getDsaRegion(RWsSession &session, const RWindowBase &window)
 void MMF::DsaVideoPlayer::handleParametersChanged(VideoParameters parameters)
 {
     TRACE_CONTEXT(DsaVideoPlayer::handleParametersChanged, EVideoInternal);
-    TRACE_ENTRY("parameters 0x%x", parameters);
+    TRACE_ENTRY("parameters 0x%x", parameters.operator int());
 
     if (!m_window)
         return;
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 4de7ad8..7c9ea04 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
 
 and has the sha1 checksum
 
-        ecfa4583e573ce4dff1f0df12f6bdba3022376e5
+        14feb62c96ffe2c37e3e2fdac4e370fdbc76ef62
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 2bd506b..b7e46c7 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,30 @@
+2010-04-09  David Leong  <david.leong@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Symbian apps crash on exit due to a bad qObject_cast.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37303
+
+        Added check for NULL to avoid the crash.
+
+        * plugins/symbian/PluginViewSymbian.cpp:
+        (WebCore::PluginView::platformDestroy):
+
+2009-11-15  Dave Tapuska  <dtapuska@rim.com>
+
+        Reviewed by George Staikos.
+        
+        Compare UChars single unit at a time as opposed to the uint32_t
+        approach as casting to unaligned addresses may cause a bus failure
+        on ARMv5 and below. This change replicates the same defines that
+        exists in AtomicString.cpp
+
+        https://bugs.webkit.org/show_bug.cgi?id=31475
+        
+        * platform/text/StringHash.h:
+        (WebCore::StringHash::equal):
+
 2010-03-25  yael aharon  <yael.aharon@nokia.com>
 
         Reviewed by Laszlo Gombos.
diff --git a/src/3rdparty/webkit/WebCore/platform/text/StringHash.h b/src/3rdparty/webkit/WebCore/platform/text/StringHash.h
index 336dce3..5d01ea8 100644
--- a/src/3rdparty/webkit/WebCore/platform/text/StringHash.h
+++ b/src/3rdparty/webkit/WebCore/platform/text/StringHash.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2006, 2007, 2008 Apple Inc. All rights reserved
+ * Copyright (C) Research In Motion Limited 2009. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -47,6 +48,16 @@ namespace WebCore {
             if (aLength != bLength)
                 return false;
 
+#if PLATFORM(ARM) || PLATFORM(SH4)
+            const UChar* aChars = a->characters();
+            const UChar* bChars = b->characters();
+            for (unsigned i = 0; i != aLength; ++i) {
+                if (*aChars++ != *bChars++)
+                    return false;
+            }
+            return true;
+#else
+            /* Do it 4-bytes-at-a-time on architectures where it's safe */
             const uint32_t* aChars = reinterpret_cast<const uint32_t*>(a->characters());
             const uint32_t* bChars = reinterpret_cast<const uint32_t*>(b->characters());
 
@@ -59,6 +70,7 @@ namespace WebCore {
                 return false;
 
             return true;
+#endif
         }
 
         static unsigned hash(const RefPtr<StringImpl>& key) { return key->hash(); }
diff --git a/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp b/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp
index 9e107cd..0c742a2 100644
--- a/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp
+++ b/src/3rdparty/webkit/WebCore/plugins/symbian/PluginViewSymbian.cpp
@@ -453,7 +453,7 @@ bool PluginView::platformStart()
 void PluginView::platformDestroy()
 {
     QWebPageClient* client = m_parentFrame->view()->hostWindow()->platformPageClient();
-    if (QGraphicsWebView *webView = qobject_cast<QGraphicsWebView*>(client->pluginParent()))
+    if (client && qobject_cast<QGraphicsWebView*>(client->pluginParent()))
         delete static_cast<PluginContainerSymbian*>(platformPluginWidget())->proxy();
     else
         delete platformPluginWidget();
diff --git a/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def b/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def
index 086e986..cc609e1 100644
--- a/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def
+++ b/src/3rdparty/webkit/WebKit/qt/symbian/bwins/QtWebKitu.def
@@ -623,5 +623,6 @@ EXPORTS
 	?qt_networkAccessAllowed@@YAX_N@Z @ 622 NONAME ; void qt_networkAccessAllowed(bool)
 	?qt_resumeActiveDOMObjects@@YAXPAVQWebFrame@@@Z @ 623 NONAME ; void qt_resumeActiveDOMObjects(class QWebFrame *)
 	?qt_suspendActiveDOMObjects@@YAXPAVQWebFrame@@@Z @ 624 NONAME ; void qt_suspendActiveDOMObjects(class QWebFrame *)
-	?qtwebkit_webframe_scrollRecursively@@YA_NPAVQWebFrame@@HH@Z @ 625 NONAME ; bool qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int)
+	?qtwebkit_webframe_scrollRecursively@@YA_NPAVQWebFrame@@HH@Z @ 625 NONAME ABSENT ; bool qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int)
+	?qtwebkit_webframe_scrollRecursively@@YAXPAVQWebFrame@@HHABVQPoint@@@Z @ 626 NONAME ; void qtwebkit_webframe_scrollRecursively(class QWebFrame *, int, int, class QPoint const &)
 
diff --git a/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def b/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
index cfa8f7f..d244ad5 100644
--- a/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
+++ b/src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
@@ -694,4 +694,4 @@ EXPORTS
 	_Z25qt_resumeActiveDOMObjectsP9QWebFrame @ 693 NONAME
 	_Z26qt_suspendActiveDOMObjectsP9QWebFrame @ 694 NONAME
 	_Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameii @ 695 NONAME ABSENT
-	_Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameiiRK6QPoint @ 715 NONAME
+	_Z35qtwebkit_webframe_scrollRecursivelyP9QWebFrameiiRK6QPoint @ 696 NONAME
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 8fc3fb8..f30f301 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -522,8 +522,6 @@ QCoreApplication::QCoreApplication(int &argc, char **argv)
 
 }
 
-extern void set_winapp_name();
-
 // ### move to QCoreApplicationPrivate constructor?
 void QCoreApplication::init()
 {
@@ -534,11 +532,6 @@ void QCoreApplication::init()
     qt_locale_initialized = true;
 #endif
 
-#ifdef Q_WS_WIN
-    // Get the application name/instance if qWinMain() was not invoked
-    set_winapp_name();
-#endif
-
     Q_ASSERT_X(!self, "QCoreApplication", "there should be only one application object");
     QCoreApplication::self = this;
 
diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp
index c1925e7..320f801 100644
--- a/src/corelib/kernel/qcoreapplication_win.cpp
+++ b/src/corelib/kernel/qcoreapplication_win.cpp
@@ -52,26 +52,31 @@
 
 QT_BEGIN_NAMESPACE
 
-char         appFileName[MAX_PATH];                // application file name
-char         theAppName[MAX_PATH];                        // application name
-HINSTANCE appInst        = 0;                // handle to app instance
-HINSTANCE appPrevInst        = 0;                // handle to prev app instance
-int appCmdShow = 0;
 bool usingWinMain = false;  // whether the qWinMain() is used or not
+int appCmdShow = 0;
 
 Q_CORE_EXPORT HINSTANCE qWinAppInst()                // get Windows app handle
 {
-    return appInst;
+    return GetModuleHandle(0);
 }
 
 Q_CORE_EXPORT HINSTANCE qWinAppPrevInst()                // get Windows prev app handle
 {
-    return appPrevInst;
+    return 0;
 }
 
 Q_CORE_EXPORT int qWinAppCmdShow()                        // get main window show command
 {
+#if defined(Q_OS_WINCE)
     return appCmdShow;
+#else
+    STARTUPINFO startupInfo;
+    GetStartupInfo(&startupInfo);
+
+    return (startupInfo.dwFlags & STARTF_USESHOWWINDOW)
+        ? startupInfo.wShowWindow
+        : SW_SHOWDEFAULT;
+#endif
 }
 
 Q_CORE_EXPORT QString qAppFileName()                // get application file name
@@ -115,25 +120,6 @@ Q_CORE_EXPORT QString qAppFileName()                // get application file name
     return res;
 }
 
-void set_winapp_name()
-{
-    static bool already_set = false;
-    if (!already_set) {
-        already_set = true;
-
-        QString moduleName = qAppFileName();
-
-        QByteArray filePath = moduleName.toLocal8Bit();
-        QByteArray fileName = QFileInfo(moduleName).baseName().toLocal8Bit();
-
-        memcpy(appFileName, filePath.constData(), filePath.length());
-        memcpy(theAppName, fileName.constData(), fileName.length());
-
-        if (appInst == 0)
-            appInst = GetModuleHandle(0);
-    }
-}
-
 QString QCoreApplicationPrivate::appName() const
 {
     return QFileInfo(qAppFileName()).baseName();
@@ -198,20 +184,17 @@ void qWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR cmdParam,
     already_called = true;
     usingWinMain = true;
 
-  // Install default debug handler
-
+    // Install default debug handler
     qInstallMsgHandler(qWinMsgHandler);
 
-  // Create command line
-
+    // Create command line
     argv = qWinCmdLine<char>(cmdParam, int(strlen(cmdParam)), argc);
-    // Get Windows parameters
 
-    appInst = instance;
-    appPrevInst = prevInstance;
     appCmdShow = cmdShow;
 
-    set_winapp_name();
+    // Ignore Windows parameters
+    Q_UNUSED(instance);
+    Q_UNUSED(prevInstance);
 }
 
 /*!
diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h
index c69dd09..cbe6146 100644
--- a/src/corelib/tools/qsimd_p.h
+++ b/src/corelib/tools/qsimd_p.h
@@ -66,6 +66,9 @@ QT_BEGIN_HEADER
 #  include <emmintrin.h>
 #  undef posix_memalign
 #else
+#  ifdef Q_CC_MINGW
+#    include <windows.h>
+#  endif
 #  include <emmintrin.h>
 #endif
 
diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp
index 8f9323a..13b18a6 100644
--- a/src/dbus/qdbusserver.cpp
+++ b/src/dbus/qdbusserver.cpp
@@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE
 /*!
     \class QDBusServer
     \inmodule QtDBus
-    \since 4.2
+    \internal
 
     \brief The QDBusServer class provides peer-to-peer communication
     between processes on the same computer.
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
index f14f773..08ede7d 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
@@ -42,6 +42,8 @@
 #include "private/qdeclarativeanimatedimage_p.h"
 #include "private/qdeclarativeanimatedimage_p_p.h"
 
+#ifndef QT_NO_MOVIE
+
 #include <qdeclarativeengine.h>
 
 #include <QMovie>
@@ -320,3 +322,5 @@ void QDeclarativeAnimatedImage::componentComplete()
 }
 
 QT_END_NAMESPACE
+
+#endif // QT_NO_MOVIE
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
index 6ab66b3..b148fa4 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p.h
@@ -44,6 +44,8 @@
 
 #include "private/qdeclarativeimage_p.h"
 
+#ifndef QT_NO_MOVIE
+
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
@@ -103,4 +105,6 @@ QML_DECLARE_TYPE(QDeclarativeAnimatedImage)
 
 QT_END_HEADER
 
+#endif // QT_NO_MOVIE
+
 #endif
diff --git a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
index 8ca9755..a02893d 100644
--- a/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
+++ b/src/declarative/graphicsitems/qdeclarativeanimatedimage_p_p.h
@@ -55,6 +55,8 @@
 
 #include "private/qdeclarativeimage_p_p.h"
 
+#ifndef QT_NO_MOVIE
+
 QT_BEGIN_NAMESPACE
 
 class QMovie;
@@ -80,4 +82,6 @@ public:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_MOVIE
+
 #endif // QDECLARATIVEANIMATEDIMAGE_P_H
diff --git a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
index 7989a27..2af14f6 100644
--- a/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
@@ -82,7 +82,9 @@
 
 void QDeclarativeItemModule::defineModule()
 {
+#ifndef QT_NO_MOVIE
     qmlRegisterType<QDeclarativeAnimatedImage>("Qt",4,6,"AnimatedImage");
+#endif
     qmlRegisterType<QGraphicsBlurEffect>("Qt",4,6,"Blur");
     qmlRegisterType<QDeclarativeBorderImage>("Qt",4,6,"BorderImage");
     qmlRegisterType<QGraphicsColorizeEffect>("Qt",4,6,"Colorize");
diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp
index 52303f5..28cde3e 100644
--- a/src/gui/animation/qguivariantanimation.cpp
+++ b/src/gui/animation/qguivariantanimation.cpp
@@ -38,12 +38,11 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
-#ifndef QT_NO_ANIMATION
-
 #include <QtCore/qvariantanimation.h>
 #include <private/qvariantanimation_p.h>
 
+#ifndef QT_NO_ANIMATION
+
 #include <QtGui/qcolor.h>
 #include <QtGui/qvector2d.h>
 #include <QtGui/qvector3d.h>
diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp
index 3b5fb9f..cb74a3c 100644
--- a/src/gui/dialogs/qfiledialog.cpp
+++ b/src/gui/dialogs/qfiledialog.cpp
@@ -723,15 +723,19 @@ void QFileDialog::setVisible(bool visible)
             // Set WA_DontShowOnScreen so that QDialog::setVisible(visible) below
             // updates the state correctly, but skips showing the non-native version:
             setAttribute(Qt::WA_DontShowOnScreen);
+#ifndef QT_NO_FSCOMPLETER
             //So the completer don't try to complete and therefore to show a popup
             d->completer->setModel(0);
+#endif
         } else {
             d->nativeDialogInUse = false;
             setAttribute(Qt::WA_DontShowOnScreen, false);
+#ifndef QT_NO_FSCOMPLETER
             if (d->proxyModel != 0)
                 d->completer->setModel(d->proxyModel);
             else
                 d->completer->setModel(d->model);
+#endif
         }
     }
 
diff --git a/src/gui/dialogs/qprintdialog_unix.cpp b/src/gui/dialogs/qprintdialog_unix.cpp
index 9b4d6e8..e3c62be 100644
--- a/src/gui/dialogs/qprintdialog_unix.cpp
+++ b/src/gui/dialogs/qprintdialog_unix.cpp
@@ -703,7 +703,7 @@ QUnixPrintWidgetPrivate::QUnixPrintWidgetPrivate(QUnixPrintWidget *p)
     }
 #endif
 
-#ifndef QT_NO_FILESYSTEMMODEL
+#if !defined(QT_NO_FILESYSTEMMODEL) && !defined(QT_NO_COMPLETER)
     QFileSystemModel *fsm = new QFileSystemModel(widget.filename);
     fsm->setRootPath(QDir::homePath());
     widget.filename->setCompleter(new QCompleter(fsm, widget.filename));
diff --git a/src/gui/egl/qegl_p.h b/src/gui/egl/qegl_p.h
index 540cd3d..f81add6 100644
--- a/src/gui/egl/qegl_p.h
+++ b/src/gui/egl/qegl_p.h
@@ -139,6 +139,12 @@ QT_BEGIN_NAMESPACE
 typedef void *EGLImageKHR;
 #define EGL_NO_IMAGE_KHR            ((EGLImageKHR)0)
 #define EGL_IMAGE_PRESERVED_KHR     0x30D2
+#define EGL_KHR_image_base
+#endif
+
+#if !defined(EGL_KHR_image) && !defined(EGL_KHR_image_pixmap)
+#define EGL_NATIVE_PIXMAP_KHR       0x30B0
+#define EGL_KHR_image_pixmap
 #endif
 
 // It is possible that something has included eglext.h (like Symbian 10.1's broken egl.h), in
@@ -154,9 +160,6 @@ extern Q_GUI_EXPORT _eglCreateImageKHR eglCreateImageKHR;
 extern Q_GUI_EXPORT _eglDestroyImageKHR eglDestroyImageKHR;
 #endif // (defined(EGL_KHR_image) || defined(EGL_KHR_image_base)) && !defined(EGL_EGLEXT_PROTOTYPES)
 
-#if !defined(EGL_KHR_image) && !defined(EGL_KHR_image_pixmap)
-#define EGL_NATIVE_PIXMAP_KHR       0x30B0
-#endif
 
 
 class QEglProperties;
diff --git a/src/gui/egl/qegl_x11.cpp b/src/gui/egl/qegl_x11.cpp
index 91423c8..5341ea1 100644
--- a/src/gui/egl/qegl_x11.cpp
+++ b/src/gui/egl/qegl_x11.cpp
@@ -147,9 +147,6 @@ VisualID QEgl::getCompatibleVisualId(EGLConfig config)
     EGLint configAlphaSize = 0;
     eglGetConfigAttrib(display(), config, EGL_ALPHA_SIZE, &configAlphaSize);
 
-    eglGetConfigAttrib(display(), config, EGL_BUFFER_SIZE, &eglValue);
-    int configBitDepth = eglValue;
-
     eglGetConfigAttrib(display(), config, EGL_CONFIG_ID, &eglValue);
     int configId = eglValue;
 
@@ -166,28 +163,53 @@ VisualID QEgl::getCompatibleVisualId(EGLConfig config)
         int matchingCount = 0;
         chosenVisualInfo = XGetVisualInfo(X11->display, VisualIDMask, &visualInfoTemplate, &matchingCount);
         if (chosenVisualInfo) {
-            if (configBitDepth == chosenVisualInfo->depth) {
+            int visualRedSize = countBits(chosenVisualInfo->red_mask);
+            int visualGreenSize = countBits(chosenVisualInfo->green_mask);
+            int visualBlueSize = countBits(chosenVisualInfo->blue_mask);
+            int visualAlphaSize = -1; // Need XRender to tell us the alpha channel size
+
 #if !defined(QT_NO_XRENDER)
+            if (X11->use_xrender) {
                 // If we have XRender, actually check the visual supplied by EGL is ARGB
-                if (configAlphaSize > 0) {
-                    XRenderPictFormat *format;
-                    format = XRenderFindVisualFormat(X11->display, chosenVisualInfo->visual);
-                    if (!format || (format->type != PictTypeDirect) || (!format->direct.alphaMask)) {
-                        qWarning("Warning: EGL suggested using X visual ID %d for config %d, but this is not ARGB",
-                                 (int)visualId, configId);
-                        visualId = 0;
-                    }
-                }
+                XRenderPictFormat *format;
+                format = XRenderFindVisualFormat(X11->display, chosenVisualInfo->visual);
+                if (format && (format->type == PictTypeDirect))
+                    visualAlphaSize = countBits(format->direct.alphaMask);
+            }
 #endif
-            } else {
-                qWarning("Warning: EGL suggested using X visual ID %d (%d bpp) for config %d (%d bpp), but the depths do not match!",
-                         (int)visualId, chosenVisualInfo->depth, configId, configBitDepth);
+
+            bool visualMatchesConfig = false;
+            if ( visualRedSize == configRedSize &&
+                 visualGreenSize == configGreenSize &&
+                 visualBlueSize == configBlueSize )
+            {
+                // We need XRender to check the alpha channel size of the visual. If we don't have
+                // the alpha size, we don't check it against the EGL config's alpha size.
+                if (visualAlphaSize >= 0)
+                    visualMatchesConfig = visualAlphaSize == configAlphaSize;
+                else
+                    visualMatchesConfig = true;
+            }
+
+            if (!visualMatchesConfig) {
+                if (visualAlphaSize >= 0) {
+                    qWarning("Warning: EGL suggested using X Visual ID %d (ARGB%d%d%d%d) for EGL config %d (ARGB%d%d%d%d), but this is incompatable",
+                             (int)visualId, visualAlphaSize, visualRedSize, visualGreenSize, visualBlueSize,
+                             configId, configAlphaSize, configRedSize, configGreenSize, configBlueSize);
+                } else {
+                    qWarning("Warning: EGL suggested using X Visual ID %d (RGB%d%d%d) for EGL config %d (RGB%d%d%d), but this is incompatable",
+                             (int)visualId, visualRedSize, visualGreenSize, visualBlueSize,
+                             configId, configRedSize, configGreenSize, configBlueSize);
+                }
                 visualId = 0;
             }
+        } else {
+            qWarning("Warning: EGL suggested using X Visual ID %d for EGL config %d, but that isn't a valid ID",
+                     (int)visualId, configId);
+            visualId = 0;
         }
         XFree(chosenVisualInfo);
     }
-
     if (visualId) {
 #ifdef QT_DEBUG_X11_VISUAL_SELECTION
         if (configAlphaSize > 0)
@@ -201,17 +223,16 @@ VisualID QEgl::getCompatibleVisualId(EGLConfig config)
 
     // If EGL didn't give us a valid visual ID, try XRender
 #if !defined(QT_NO_XRENDER)
-    if (!visualId) {
+    if (!visualId && X11->use_xrender) {
         XVisualInfo visualInfoTemplate;
         memset(&visualInfoTemplate, 0, sizeof(XVisualInfo));
 
-        visualInfoTemplate.depth = configBitDepth;
         visualInfoTemplate.c_class = TrueColor;
 
         XVisualInfo *matchingVisuals;
         int matchingCount = 0;
         matchingVisuals = XGetVisualInfo(X11->display,
-                                         VisualDepthMask|VisualClassMask,
+                                         VisualClassMask,
                                          &visualInfoTemplate,
                                          &matchingCount);
 
@@ -246,19 +267,27 @@ VisualID QEgl::getCompatibleVisualId(EGLConfig config)
 
 
     // Finally, if XRender also failed to find a visual (or isn't present), try to
-    // use XGetVisualInfo and only use the bit depth to match on:
+    // use XGetVisualInfo and only use the bit depths to match on:
     if (!visualId) {
         XVisualInfo visualInfoTemplate;
         memset(&visualInfoTemplate, 0, sizeof(XVisualInfo));
-
-        visualInfoTemplate.depth = configBitDepth;
-
         XVisualInfo *matchingVisuals;
         int matchingCount = 0;
+
+        visualInfoTemplate.depth = configRedSize + configGreenSize + configBlueSize + configAlphaSize;
         matchingVisuals = XGetVisualInfo(X11->display,
                                          VisualDepthMask,
                                          &visualInfoTemplate,
                                          &matchingCount);
+        if (!matchingVisuals) {
+            // Try again without taking the alpha channel into account:
+            visualInfoTemplate.depth = configRedSize + configGreenSize + configBlueSize;
+            matchingVisuals = XGetVisualInfo(X11->display,
+                                             VisualDepthMask,
+                                             &visualInfoTemplate,
+                                             &matchingCount);
+        }
+
         if (matchingVisuals) {
             visualId = matchingVisuals[0].visualid;
             XFree(matchingVisuals);
diff --git a/src/gui/embedded/qscreenlinuxfb_qws.cpp b/src/gui/embedded/qscreenlinuxfb_qws.cpp
index 8a21022..1effcfa 100644
--- a/src/gui/embedded/qscreenlinuxfb_qws.cpp
+++ b/src/gui/embedded/qscreenlinuxfb_qws.cpp
@@ -91,6 +91,7 @@ public:
     int startuph;
     int startupd;
     bool blank;
+    QLinuxFbScreen::DriverTypes driverType;
 
     bool doGraphicsMode;
 #ifdef QT_QWS_DEPTH_GENERIC
@@ -165,6 +166,36 @@ void QLinuxFbScreenPrivate::closeTty()
 }
 
 /*!
+    \enum QLinuxFbScreen::DriverTypes
+
+    This enum describes the driver type.
+
+    \value GenericDriver Generic Linux framebuffer driver
+    \value EInk8Track e-Ink framebuffer driver using the 8Track chipset
+ */
+
+/*!
+    \fn QLinuxFbScreen::fixupScreenInfo(fb_fix_screeninfo &finfo, fb_var_screeninfo &vinfo)
+
+    Adjust the values returned by the framebuffer driver, to work
+    around driver bugs or nonstandard behavior in certain drivers.
+    \a finfo and \a vinfo specify the fixed and variable screen info
+    returned by the driver.
+ */
+void QLinuxFbScreen::fixupScreenInfo(fb_fix_screeninfo &finfo, fb_var_screeninfo &vinfo)
+{
+    // 8Track e-ink devices (as found in Sony PRS-505) lie
+    // about their bit depth -- they claim they're 1 bit per
+    // pixel while the only supported mode is 8 bit per pixel
+    // grayscale.
+    // Caused by this, they also miscalculate their line length.
+    if(!strcmp(finfo.id, "8TRACKFB") && vinfo.bits_per_pixel == 1) {
+        vinfo.bits_per_pixel = 8;
+        finfo.line_length = vinfo.xres;
+    }
+}
+
+/*!
     \internal
 
     \class QLinuxFbScreen
@@ -306,6 +337,8 @@ bool QLinuxFbScreen::connect(const QString &displaySpec)
         return false;
     }
 
+    d_ptr->driverType = strcmp(finfo.id, "8TRACKFB") ? GenericDriver : EInk8Track;
+
     if (finfo.type == FB_TYPE_VGA_PLANES) {
         qWarning("VGA16 video mode not supported");
         return false;
@@ -318,6 +351,8 @@ bool QLinuxFbScreen::connect(const QString &displaySpec)
         return false;
     }
 
+    fixupScreenInfo(finfo, vinfo);
+
     grayscale = vinfo.grayscale;
     d = vinfo.bits_per_pixel;
     if (d == 24) {
@@ -664,11 +699,6 @@ bool QLinuxFbScreen::initDevice()
            vinfo.transp.msb_right);
 #endif
 
-    d_ptr->startupw=vinfo.xres;
-    d_ptr->startuph=vinfo.yres;
-    d_ptr->startupd=vinfo.bits_per_pixel;
-    grayscale = vinfo.grayscale;
-
     if (ioctl(d_ptr->fd, FBIOGET_FSCREENINFO, &finfo)) {
         perror("QLinuxFbScreen::initDevice");
         qCritical("Error reading fixed information in card init");
@@ -677,6 +707,13 @@ bool QLinuxFbScreen::initDevice()
         return true;
     }
 
+    fixupScreenInfo(finfo, vinfo);
+
+    d_ptr->startupw=vinfo.xres;
+    d_ptr->startuph=vinfo.yres;
+    d_ptr->startupd=vinfo.bits_per_pixel;
+    grayscale = vinfo.grayscale;
+
 #ifdef __i386__
     // Now init mtrr
     if(!::getenv("QWS_NOMTRR")) {
@@ -1122,6 +1159,7 @@ void QLinuxFbScreen::setMode(int nw,int nh,int nd)
         qFatal("Error reading fixed information");
     }
 
+    fixupScreenInfo(finfo, vinfo);
     disconnect();
     connect(d_ptr->displaySpec);
     exposeRegion(region(), 0);
@@ -1200,6 +1238,26 @@ int QLinuxFbScreen::sharedRamSize(void * end)
 /*!
     \reimp
 */
+void QLinuxFbScreen::setDirty(const QRect &r)
+{
+    if(d_ptr->driverType == EInk8Track) {
+        // e-Ink displays need a trigger to actually show what is
+        // in their framebuffer memory. The 8-Track driver does this
+        // by adding custom IOCTLs - FBIO_EINK_DISP_PIC (0x46a2) takes
+        // an argument specifying whether or not to flash the screen
+        // while updating.
+        // There doesn't seem to be a way to tell it to just update
+        // a subset of the screen.
+        if(r.left() == 0 && r.top() == 0 && r.width() == dw && r.height() == dh)
+            ioctl(d_ptr->fd, 0x46a2, 1);
+        else
+            ioctl(d_ptr->fd, 0x46a2, 0);
+    }
+}
+
+/*!
+    \reimp
+*/
 void QLinuxFbScreen::blank(bool on)
 {
     if (d_ptr->blank == on)
@@ -1315,7 +1373,9 @@ void QLinuxFbScreen::setPixelFormat(struct fb_var_screeninfo info)
 
 bool QLinuxFbScreen::useOffscreen()
 {
-    if ((mapsize - size) < 16*1024)
+    // Not done for 8Track because on e-Ink displays,
+    // everything is offscreen anyway
+    if (d_ptr->driverType == EInk8Track || ((mapsize - size) < 16*1024))
         return false;
 
     return true;
diff --git a/src/gui/embedded/qscreenlinuxfb_qws.h b/src/gui/embedded/qscreenlinuxfb_qws.h
index ac488b7..6abadbf 100644
--- a/src/gui/embedded/qscreenlinuxfb_qws.h
+++ b/src/gui/embedded/qscreenlinuxfb_qws.h
@@ -88,6 +88,8 @@ public:
 
     virtual bool useOffscreen();
 
+    enum DriverTypes { GenericDriver, EInk8Track };
+
     virtual void disconnect();
     virtual void shutdownDevice();
     virtual void setMode(int,int,int);
@@ -98,6 +100,7 @@ public:
     virtual uchar * cache(int);
     virtual void uncache(uchar *);
     virtual int sharedRamSize(void *);
+    virtual void setDirty(const QRect&);
 
     QLinuxFb_Shared * shared;
 
@@ -109,6 +112,7 @@ protected:
     int dataoffset;
     int cacheStart;
 
+    virtual void fixupScreenInfo(fb_fix_screeninfo &finfo, fb_var_screeninfo &vinfo);
     static void clearCache(QScreen *instance, int);
 
 private:
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index f106b3d..d6daf4d 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -7112,7 +7112,8 @@ void QGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
                     // Root items that ignore transformations need to
                     // calculate their diff by mapping viewport coordinates
                     // directly to parent coordinates.
-                    QTransform viewToParentTransform = (item->transform().translate(item->d_ptr->pos.x(), item->d_ptr->pos.y()))
+                    // COMBINE
+                    QTransform viewToParentTransform = (item->d_func()->transformData->computedFullTransform().translate(item->d_ptr->pos.x(), item->d_ptr->pos.y()))
                                                        * (item->sceneTransform() * view->viewportTransform()).inverted();
                     currentParentPos = viewToParentTransform.map(QPointF(view->mapFromGlobal(event->screenPos())));
                     buttonDownParentPos = viewToParentTransform.map(QPointF(view->mapFromGlobal(event->buttonDownScreenPos(Qt::LeftButton))));
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index b22f732..300a03f 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -55,7 +55,7 @@ DEFINES += Q_INTERNAL_QAPP_SRC
 symbian {
     TARGET.UID3=0x2001B2DD
 
-    symbian-abld:symbian-sbsv2 {
+    symbian-abld|symbian-sbsv2 {
         # ro-section in gui can exceed default allocated space, so move rw-section a little further
         QMAKE_LFLAGS.ARMCC += --rw-base 0x800000
         QMAKE_LFLAGS.GCCE += -Tdata 0xC00000
diff --git a/src/gui/itemviews/qfileiconprovider.cpp b/src/gui/itemviews/qfileiconprovider.cpp
index f321ab3..5dbd1f0 100644
--- a/src/gui/itemviews/qfileiconprovider.cpp
+++ b/src/gui/itemviews/qfileiconprovider.cpp
@@ -254,7 +254,9 @@ QIcon QFileIconProviderPrivate::getWinIcon(const QFileInfo &fileInfo) const
     val = SHGetFileInfo((const wchar_t *)QDir::toNativeSeparators(fileInfo.filePath()).utf16(), 0, &info,
                         sizeof(SHFILEINFO), SHGFI_SMALLICON|SHGFI_SYSICONINDEX);
 #endif
-    if (val) {
+
+    // Even if GetFileInfo returns a valid result, hIcon can be empty in some cases
+    if (val && info.hIcon) {
         if (fileInfo.isDir() && !fileInfo.isRoot()) {
             //using the unique icon index provided by windows save us from duplicate keys
             key = QString::fromLatin1("qt_dir_%1").arg(info.iIcon);
@@ -293,7 +295,7 @@ QIcon QFileIconProviderPrivate::getWinIcon(const QFileInfo &fileInfo) const
     val = SHGetFileInfo((const wchar_t *)QDir::toNativeSeparators(fileInfo.filePath()).utf16(), 0, &info,
                         sizeof(SHFILEINFO), SHGFI_LARGEICON|SHGFI_SYSICONINDEX);
 #endif
-    if (val) {
+    if (val && info.hIcon) {
         if (fileInfo.isDir() && !fileInfo.isRoot()) {
             //using the unique icon index provided by windows save us from duplicate keys
             key = QString::fromLatin1("qt_dir_%1").arg(info.iIcon);
diff --git a/src/gui/itemviews/qitemselectionmodel.cpp b/src/gui/itemviews/qitemselectionmodel.cpp
index d6e68f6..f848321 100644
--- a/src/gui/itemviews/qitemselectionmodel.cpp
+++ b/src/gui/itemviews/qitemselectionmodel.cpp
@@ -292,6 +292,27 @@ static void indexesFromRange(const QItemSelectionRange &range, QModelIndexList &
 }
 
 /*!
+    Returns true if the selection range contains no selectable item
+    \since 4.7
+*/
+
+bool QItemSelectionRange::isEmpty() const
+{
+    if (!isValid() || !model())
+        return true;
+
+    for (int column = left(); column <= right(); ++column) {
+        for (int row = top(); row <= bottom(); ++row) {
+            QModelIndex index = model()->index(row, column, parent());
+            Qt::ItemFlags flags = model()->flags(index);
+            if ((flags & Qt::ItemIsSelectable) && (flags & Qt::ItemIsEnabled))
+                return false;
+        }
+    }
+    return true;
+}
+
+/*!
     Returns the list of model index items stored in the selection.
 */
 
diff --git a/src/gui/itemviews/qitemselectionmodel.h b/src/gui/itemviews/qitemselectionmodel.h
index 9980d0f..436514f 100644
--- a/src/gui/itemviews/qitemselectionmodel.h
+++ b/src/gui/itemviews/qitemselectionmodel.h
@@ -108,6 +108,8 @@ public:
                 && top() <= bottom() && left() <= right());
     }
 
+    bool isEmpty() const;
+
     QModelIndexList indexes() const;
 
 private:
diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp
index 43445b4..f49f273 100644
--- a/src/gui/itemviews/qtableview.cpp
+++ b/src/gui/itemviews/qtableview.cpp
@@ -1847,7 +1847,9 @@ void QTableView::setSelection(const QRect &rect, QItemSelectionModel::SelectionF
             selection.append(QItemSelectionRange(topLeft, bottomRight));
         }
     } else { // nothing moved
-        selection.append(QItemSelectionRange(tl, br));
+        QItemSelectionRange range(tl, br);
+        if (!range.isEmpty())
+            selection.append(range);
     }
 
     d->selectionModel->select(selection, command);
diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index d934683..c3ff2bd 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -3194,12 +3194,16 @@ void QTreeViewPrivate::layout(int i, bool recursiveExpanding, bool afterIsUninit
 int QTreeViewPrivate::pageUp(int i) const
 {
     int index = itemAtCoordinate(coordinateForItem(i) - viewport->height());
+    while (isItemHiddenOrDisabled(index))
+        index--;
     return index == -1 ? 0 : index;
 }
 
 int QTreeViewPrivate::pageDown(int i) const
 {
     int index = itemAtCoordinate(coordinateForItem(i) + viewport->height());
+    while (isItemHiddenOrDisabled(index))
+        index++;
     return index == -1 ? viewItems.count() - 1 : index;
 }
 
diff --git a/src/gui/itemviews/qtreewidget.cpp b/src/gui/itemviews/qtreewidget.cpp
index 19ed10b..4c80325 100644
--- a/src/gui/itemviews/qtreewidget.cpp
+++ b/src/gui/itemviews/qtreewidget.cpp
@@ -3039,10 +3039,14 @@ QList<QTreeWidgetItem*> QTreeWidget::selectedItems() const
     Q_D(const QTreeWidget);
     QModelIndexList indexes = selectionModel()->selectedIndexes();
     QList<QTreeWidgetItem*> items;
+    items.reserve(indexes.count());
+    QSet<QTreeWidgetItem *> seen;
+    seen.reserve(indexes.count());
     for (int i = 0; i < indexes.count(); ++i) {
         QTreeWidgetItem *item = d->item(indexes.at(i));
-        if (isItemHidden(item) || items.contains(item)) // ### slow, optimize later
+        if (isItemHidden(item) || seen.contains(item))
             continue;
+        seen.insert(item);
         items.append(item);
     }
     return items;
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index be2683d..b0a23d4 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -5292,9 +5292,9 @@ QInputContext *QApplication::inputContext() const
         QApplication *that = const_cast<QApplication *>(this);
         const QStringList keys = QInputContextFactory::keys();
         // Try hbim and coefep first, then try others.
-        if (keys.contains("hbim")) {
+        if (keys.contains(QLatin1String("hbim"))) {
             that->d_func()->inputContext = QInputContextFactory::create(QLatin1String("hbim"), that);
-        } else if (keys.contains("coefep")) {
+        } else if (keys.contains(QLatin1String("coefep"))) {
             that->d_func()->inputContext = QInputContextFactory::create(QLatin1String("coefep"), that);
         } else {
             for (int c = 0; c < keys.size() && !d->inputContext; ++c) {
diff --git a/src/gui/kernel/qeventdispatcher_mac.mm b/src/gui/kernel/qeventdispatcher_mac.mm
index 62e1e81..a7f1224 100644
--- a/src/gui/kernel/qeventdispatcher_mac.mm
+++ b/src/gui/kernel/qeventdispatcher_mac.mm
@@ -831,7 +831,14 @@ NSModalSession QEventDispatcherMacPrivate::currentModalSession()
             QBoolBlocker block1(blockSendPostedEvents, true);
             info.nswindow = window;
             [(NSWindow*) info.nswindow retain];
-            info.session = [NSApp beginModalSessionForWindow:window];
+            // When creating a modal session cocoa will rearrange the windows.
+            // In order to avoid windows to be put behind another we need to
+            // keep the window level.
+            {
+                int level = [window level];
+                info.session = [NSApp beginModalSessionForWindow:window];
+                [window setLevel:level];
+            }
         }
         currentModalSessionCached = info.session;
     }
diff --git a/src/gui/kernel/qgridlayout.cpp b/src/gui/kernel/qgridlayout.cpp
index dbd3c01..81a4d04 100644
--- a/src/gui/kernel/qgridlayout.cpp
+++ b/src/gui/kernel/qgridlayout.cpp
@@ -1852,7 +1852,7 @@ void QGridLayout::invalidate()
 /*!
     \fn int QGridLayout::colSpacing(int col) const
 
-    Use columnSpacing() instead.
+    Use columnMinimumWidth() instead.
 */
 
 /*!
diff --git a/src/gui/kernel/qlayoutitem.cpp b/src/gui/kernel/qlayoutitem.cpp
index 6a91d95..e615b2d 100644
--- a/src/gui/kernel/qlayoutitem.cpp
+++ b/src/gui/kernel/qlayoutitem.cpp
@@ -516,9 +516,7 @@ bool QWidgetItem::hasHeightForWidth() const
 {
     if (isEmpty())
         return false;
-    if (wid->layout())
-        return wid->layout()->hasHeightForWidth();
-    return wid->sizePolicy().hasHeightForWidth();
+    return wid->hasHeightForWidth();
 }
 
 /*!
diff --git a/src/gui/kernel/qsoftkeymanager.cpp b/src/gui/kernel/qsoftkeymanager.cpp
index 923144a..23f1481 100644
--- a/src/gui/kernel/qsoftkeymanager.cpp
+++ b/src/gui/kernel/qsoftkeymanager.cpp
@@ -242,6 +242,7 @@ bool QSoftKeyManager::handleUpdateSoftKeys()
     d->requestedSoftKeyActions.clear();
     bool recursiveMerging = false;
     QWidget *source = softkeySource(NULL, recursiveMerging);
+    d->initialSoftKeySource = source;
     while (source) {
         if (appendSoftkeys(*source, level))
             ++level;
diff --git a/src/gui/kernel/qsoftkeymanager_common_p.h b/src/gui/kernel/qsoftkeymanager_common_p.h
index 460d0dc..04ddf7d 100644
--- a/src/gui/kernel/qsoftkeymanager_common_p.h
+++ b/src/gui/kernel/qsoftkeymanager_common_p.h
@@ -70,6 +70,7 @@ protected:
     static QSoftKeyManager *self;
     QHash<QAction*, Qt::Key> keyedActions;
     QMultiHash<int, QAction*> requestedSoftKeyActions;
+    QWidget *initialSoftKeySource;
 
 };
 
@@ -79,4 +80,4 @@ QT_END_NAMESPACE
 
 QT_END_HEADER
 
-#endif // QSOFTKEYMANAGER_COMMON_P_H
\ No newline at end of file
+#endif // QSOFTKEYMANAGER_COMMON_P_H
diff --git a/src/gui/kernel/qsoftkeymanager_s60.cpp b/src/gui/kernel/qsoftkeymanager_s60.cpp
index 9812d72..7d643c2 100644
--- a/src/gui/kernel/qsoftkeymanager_s60.cpp
+++ b/src/gui/kernel/qsoftkeymanager_s60.cpp
@@ -312,17 +312,8 @@ bool QSoftKeyManagerPrivateS60::setMiddleSoftkey(CEikButtonGroupContainer &cba)
 bool QSoftKeyManagerPrivateS60::setRightSoftkey(CEikButtonGroupContainer &cba)
 {
     if (!setSoftkey(cba, QAction::NegativeSoftKey, RSK_POSITION)) {
-        Qt::WindowType windowType = Qt::Window;
-        QAction *action = requestedSoftKeyActions.value(0);
-        if (action) {
-            QWidget *actionParent = action->parentWidget();
-            Q_ASSERT_X(actionParent, Q_FUNC_INFO, "No parent set for softkey action!");
-
-            QWidget *actionWindow = actionParent->window();
-            Q_ASSERT_X(actionWindow, Q_FUNC_INFO, "Softkey action does not have window!");
-            windowType = actionWindow->windowType();
-        }
-
+        const Qt::WindowType windowType = initialSoftKeySource
+            ? initialSoftKeySource->window()->windowType() : Qt::Window;
         if (windowType != Qt::Dialog && windowType != Qt::Popup) {
             QString text(QSoftKeyManager::tr("Exit"));
             TPtrC nativeText = qt_QString2TPtrC(text);
diff --git a/src/gui/kernel/qstackedlayout.cpp b/src/gui/kernel/qstackedlayout.cpp
index 7559066..4b49638 100644
--- a/src/gui/kernel/qstackedlayout.cpp
+++ b/src/gui/kernel/qstackedlayout.cpp
@@ -475,6 +475,32 @@ void QStackedLayout::setGeometry(const QRect &rect)
     }
 }
 
+bool QStackedLayout::hasHeightForWidth() const
+{
+    const int n = count();
+
+    for (int i = 0; i < n; ++i) {
+        if (QLayoutItem *item = itemAt(i)) {
+            if (item->hasHeightForWidth())
+                return true;
+        }
+    }
+    return false;
+}
+
+int QStackedLayout::heightForWidth(int width) const
+{
+    const int n = count();
+
+    int hfw = 0;
+    for (int i = 0; i < n; ++i) {
+        if (QLayoutItem *item = itemAt(i)) {
+            hfw = qMax(hfw, item->heightForWidth(width));
+        }
+    }
+    return hfw;
+}
+
 /*!
     \enum QStackedLayout::StackingMode
     \since 4.4
diff --git a/src/gui/kernel/qstackedlayout.h b/src/gui/kernel/qstackedlayout.h
index c069149..842b62b 100644
--- a/src/gui/kernel/qstackedlayout.h
+++ b/src/gui/kernel/qstackedlayout.h
@@ -95,6 +95,8 @@ public:
     QLayoutItem *itemAt(int) const;
     QLayoutItem *takeAt(int);
     void setGeometry(const QRect &rect);
+    bool hasHeightForWidth() const;
+    int heightForWidth(int width) const;
 
 Q_SIGNALS:
     void widgetRemoved(int index);
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index e88026c..7a8b700 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -3816,6 +3816,11 @@ void QWidget::setMaximumSize(int maxw, int maxh)
     d->updateGeometry_helper(d->extra->minw == d->extra->maxw && d->extra->minh == d->extra->maxh);
 }
 
+bool QWidgetPrivate::hasHeightForWidth() const
+{
+    return layout ? layout->hasHeightForWidth() : size_policy.hasHeightForWidth();
+}
+
 /*!
     \overload
 
@@ -7961,6 +7966,18 @@ QSize QWidget::minimumSizeHint() const
     return QSize(-1, -1);
 }
 
+/*!
+    \internal
+    This is a bit hackish, but ideally this would have been a virtual
+    function so that subclasses could reimplement their own function.
+    Instead we add a virtual function to QWidgetPrivate.
+*/
+bool QWidget::hasHeightForWidth() const
+{
+    Q_D(const QWidget);
+    return d->hasHeightForWidth();
+}
+
 
 /*!
     \fn QWidget *QWidget::parentWidget() const
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index e12148b..6e5de7d 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -524,6 +524,7 @@ public:
 
     virtual QSize sizeHint() const;
     virtual QSize minimumSizeHint() const;
+    bool hasHeightForWidth() const;
 
     QSizePolicy sizePolicy() const;
     void setSizePolicy(QSizePolicy);
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h
index 89ea256..05a859c 100644
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
@@ -493,6 +493,7 @@ public:
 
     bool setMinimumSize_helper(int &minw, int &minh);
     bool setMaximumSize_helper(int &maxw, int &maxh);
+    virtual bool hasHeightForWidth() const;
     void setConstraints_sys();
     QWidget *childAt_helper(const QPoint &, bool) const;
     void updateGeometry_helper(bool forceUpdate);
diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp
index ea7fe4f..a08c79e 100644
--- a/src/gui/painting/qbezier.cpp
+++ b/src/gui/painting/qbezier.cpp
@@ -117,8 +117,8 @@ QBezier QBezier::mapBy(const QTransform &transform) const
     return QBezier::fromPoints(transform.map(pt1()), transform.map(pt2()), transform.map(pt3()), transform.map(pt4()));
 }
 
-//0.5 is really low
-static const qreal flatness = 0.5;
+//0.05 is really low, but required for scaled-up beziers...
+static const qreal flatness = 0.05;
 
 //based on "Fast, precise flattening of cubic Bezier path and offset curves"
 //      by T. F. Hain, A. L. Ahmad, S. V. R. Racherla and D. D. Langan
diff --git a/src/gui/painting/qbrush.cpp b/src/gui/painting/qbrush.cpp
index a82d0f9..182cce9 100644
--- a/src/gui/painting/qbrush.cpp
+++ b/src/gui/painting/qbrush.cpp
@@ -989,7 +989,8 @@ QDebug operator<<(QDebug dbg, const QBrush &b)
      "LinearGradientPattern",
      "RadialGradientPattern",
      "ConicalGradientPattern",
-     "TexturePattern"
+     0, 0, 0, 0, 0, 0,
+     "TexturePattern" // 24
     };
 
     dbg.nospace() << "QBrush(" << b.color() << ',' << BRUSH_STYLES[b.style()] << ')';
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp
index 917b910..a0c9828 100644
--- a/src/gui/painting/qdrawhelper.cpp
+++ b/src/gui/painting/qdrawhelper.cpp
@@ -70,8 +70,10 @@ static uint gccBug(uint value)
   constants and structures
 */
 
-static const int fixed_scale = 1 << 16;
-static const int half_point = 1 << 15;
+enum {
+    fixed_scale = 1 << 16,
+    half_point = 1 << 15
+};
 static const int buffer_size = 2048;
 
 struct LinearGradientValues
@@ -691,37 +693,32 @@ const uint * QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Operator *
         fy -= half_point;
         while (b < end) {
             int x1 = (fx >> 16);
-            int x2 = x1 + 1;
+            int x2;
             int y1 = (fy >> 16);
-            int y2 = y1 + 1;
-
-            int distx = ((fx - (x1 << 16)) >> 8);
-            int disty = ((fy - (y1 << 16)) >> 8);
-            int idistx = 256 - distx;
-            int idisty = 256 - disty;
+            int y2;
 
             if (blendType == BlendTransformedBilinearTiled) {
                 x1 %= image_width;
+                if (x1 < 0) x1 += image_width;
+                x2 = x1 + 1;
                 x2 %= image_width;
-                y1 %= image_height;
-                y2 %= image_height;
 
-                if (x1 < 0) x1 += image_width;
-                if (x2 < 0) x2 += image_width;
+                y1 %= image_height;
                 if (y1 < 0) y1 += image_height;
-                if (y2 < 0) y2 += image_height;
-
-                Q_ASSERT(x1 >= 0 && x1 < image_width);
-                Q_ASSERT(x2 >= 0 && x2 < image_width);
-                Q_ASSERT(y1 >= 0 && y1 < image_height);
-                Q_ASSERT(y2 >= 0 && y2 < image_height);
+                y2 = y1 + 1;
+                y2 %= image_height;
             } else {
                 x1 = qBound(0, x1, image_width - 1);
-                x2 = qBound(0, x2, image_width - 1);
+                x2 = qMin(x1 + 1, image_width - 1);
                 y1 = qBound(0, y1, image_height - 1);
-                y2 = qBound(0, y2, image_height - 1);
+                y2 = qMin(y1 + 1, image_height - 1);
             }
 
+            Q_ASSERT(x1 >= 0 && x1 < image_width);
+            Q_ASSERT(x2 >= 0 && x2 < image_width);
+            Q_ASSERT(y1 >= 0 && y1 < image_height);
+            Q_ASSERT(y2 >= 0 && y2 < image_height);
+
             const uchar *s1 = data->texture.scanLine(y1);
             const uchar *s2 = data->texture.scanLine(y2);
 
@@ -730,6 +727,11 @@ const uint * QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Operator *
             uint bl = fetch(s2, x1, data->texture.colorTable);
             uint br = fetch(s2, x2, data->texture.colorTable);
 
+            int distx = (fx & 0x0000ffff) >> 8;
+            int disty = (fy & 0x0000ffff) >> 8;
+            int idistx = 256 - distx;
+            int idisty = 256 - disty;
+
             uint xtop = INTERPOLATE_PIXEL_256(tl, idistx, tr, distx);
             uint xbot = INTERPOLATE_PIXEL_256(bl, idistx, br, distx);
             *b = INTERPOLATE_PIXEL_256(xtop, idisty, xbot, disty);
@@ -753,9 +755,9 @@ const uint * QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Operator *
             const qreal py = fy * iw - 0.5;
 
             int x1 = int(px) - (px < 0);
-            int x2 = x1 + 1;
+            int x2;
             int y1 = int(py) - (py < 0);
-            int y2 = y1 + 1;
+            int y2;
 
             int distx = int((px - x1) * 256);
             int disty = int((py - y1) * 256);
@@ -764,26 +766,26 @@ const uint * QT_FASTCALL fetchTransformedBilinear(uint *buffer, const Operator *
 
             if (blendType == BlendTransformedBilinearTiled) {
                 x1 %= image_width;
+                if (x1 < 0) x1 += image_width;
+                x2 = x1 + 1;
                 x2 %= image_width;
-                y1 %= image_height;
-                y2 %= image_height;
 
-                if (x1 < 0) x1 += image_width;
-                if (x2 < 0) x2 += image_width;
+                y1 %= image_height;
                 if (y1 < 0) y1 += image_height;
-                if (y2 < 0) y2 += image_height;
-
-                Q_ASSERT(x1 >= 0 && x1 < image_width);
-                Q_ASSERT(x2 >= 0 && x2 < image_width);
-                Q_ASSERT(y1 >= 0 && y1 < image_height);
-                Q_ASSERT(y2 >= 0 && y2 < image_height);
+                y2 = y1 + 1;
+                y2 %= image_height;
             } else {
                 x1 = qBound(0, x1, image_width - 1);
-                x2 = qBound(0, x2, image_width - 1);
+                x2 = qMin(x1 + 1, image_width - 1);
                 y1 = qBound(0, y1, image_height - 1);
-                y2 = qBound(0, y2, image_height - 1);
+                y2 = qMin(y1 + 1, image_height - 1);
             }
 
+            Q_ASSERT(x1 >= 0 && x1 < image_width);
+            Q_ASSERT(x2 >= 0 && x2 < image_width);
+            Q_ASSERT(y1 >= 0 && y1 < image_height);
+            Q_ASSERT(y2 >= 0 && y2 < image_height);
+
             const uchar *s1 = data->texture.scanLine(y1);
             const uchar *s2 = data->texture.scanLine(y2);
 
@@ -5141,7 +5143,7 @@ static void blend_tiled_rgb444(int count, const QSpan *spans, void *userData)
 }
 
 
-template <SpanMethod spanMethod>
+template <SpanMethod spanMethod, TextureBlendType blendType>  /* blendType must be either BlendTransformedBilinear or BlendTransformedBilinearTiled */
 Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_argb(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
@@ -5154,10 +5156,12 @@ Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_argb(int count, const
     CompositionFunction func = functionForMode[data->rasterBuffer->compositionMode];
     uint buffer[buffer_size];
 
-    int image_x1 = data->texture.x1;
-    int image_y1 = data->texture.y1;
-    int image_x2 = data->texture.x2;
-    int image_y2 = data->texture.y2;
+    const int image_x1 = data->texture.x1;
+    const int image_y1 = data->texture.y1;
+    const int image_x2 = data->texture.x2;
+    const int image_y2 = data->texture.y2;
+    const int image_width = data->texture.width;
+    const int image_height = data->texture.height;
     const int scanline_offset = data->texture.bytesPerLine / 4;
 
     if (data->fast_matrix) {
@@ -5187,19 +5191,31 @@ Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_argb(int count, const
                 uint *b = buffer;
                 while (b < end) {
                     int x1 = (x >> 16);
-                    int x2 = x1 + 1;
+                    int x2;
                     int y1 = (y >> 16);
-                    int y2 = y1 + 1;
-
-                    int distx = ((x - (x1 << 16)) >> 8);
-                    int disty = ((y - (y1 << 16)) >> 8);
-                    int idistx = 256 - distx;
-                    int idisty = 256 - disty;
-
-                    x1 = qBound(image_x1, x1, image_x2 - 1);
-                    x2 = qBound(image_x1, x2, image_x2 - 1);
-                    y1 = qBound(image_y1, y1, image_y2 - 1);
-                    y2 = qBound(image_y1, y2, image_y2 - 1);
+                    int y2;
+
+                    if (blendType == BlendTransformedBilinearTiled) {
+                        x1 %= image_width;
+                        if (x1 < 0) x1 += image_width;
+                        x2 = x1 + 1;
+                        x2 %= image_width;
+
+                        y1 %= image_height;
+                        if (y1 < 0) y1 += image_height;
+                        y2 = y1 + 1;
+                        y2 %= image_height;
+
+                        Q_ASSERT(x1 >= 0 && x1 < image_width);
+                        Q_ASSERT(x2 >= 0 && x2 < image_width);
+                        Q_ASSERT(y1 >= 0 && y1 < image_height);
+                        Q_ASSERT(y2 >= 0 && y2 < image_height);
+                    } else {
+                        x1 = qBound(image_x1, x1, image_x2 - 1);
+                        x2 = qMin(x1 + 1, image_x2 - 1);
+                        y1 = qBound(image_y1, y1, image_y2 - 1);
+                        y2 = qMin(y1 + 1, image_y2 - 1);
+                    }
 
                     int y1_offset = y1 * scanline_offset;
                     int y2_offset = y2 * scanline_offset;
@@ -5216,6 +5232,11 @@ Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_argb(int count, const
                     uint br = image_bits[y2_offset + x2];
 #endif
 
+                    int distx = (x & 0x0000ffff) >> 8;
+                    int disty = (y & 0x0000ffff) >> 8;
+                    int idistx = 256 - distx;
+                    int idisty = 256 - disty;
+
                     uint xtop = INTERPOLATE_PIXEL_256(tl, idistx, tr, distx);
                     uint xbot = INTERPOLATE_PIXEL_256(bl, idistx, br, distx);
                     *b = INTERPOLATE_PIXEL_256(xtop, idisty, xbot, disty);
@@ -5265,19 +5286,36 @@ Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_argb(int count, const
                     const qreal py = y * iw - 0.5;
 
                     int x1 = int(px) - (px < 0);
-                    int x2 = x1 + 1;
+                    int x2;
                     int y1 = int(py) - (py < 0);
-                    int y2 = y1 + 1;
+                    int y2;
 
                     int distx = int((px - x1) * 256);
                     int disty = int((py - y1) * 256);
                     int idistx = 256 - distx;
                     int idisty = 256 - disty;
 
-                    x1 = qBound(image_x1, x1, image_x2 - 1);
-                    x2 = qBound(image_x1, x2, image_x2 - 1);
-                    y1 = qBound(image_y1, y1, image_y2 - 1);
-                    y2 = qBound(image_y1, y2, image_y2 - 1);
+                    if (blendType == BlendTransformedBilinearTiled) {
+                        x1 %= image_width;
+                        if (x1 < 0) x1 += image_width;
+                        x2 = x1 + 1;
+                        x2 %= image_width;
+
+                        y1 %= image_height;
+                        if (y1 < 0) y1 += image_height;
+                        y2 = y1 + 1;
+                        y2 %= image_height;
+
+                        Q_ASSERT(x1 >= 0 && x1 < image_width);
+                        Q_ASSERT(x2 >= 0 && x2 < image_width);
+                        Q_ASSERT(y1 >= 0 && y1 < image_height);
+                        Q_ASSERT(y2 >= 0 && y2 < image_height);
+                    } else {
+                        x1 = qBound(image_x1, x1, image_x2 - 1);
+                        x2 = qMin(x1 + 1, image_x2 - 1);
+                        y1 = qBound(image_y1, y1, image_y2 - 1);
+                        y2 = qMin(y1 + 1, image_y2 - 1);
+                    }
 
                     int y1_offset = y1 * scanline_offset;
                     int y2_offset = y2 * scanline_offset;
@@ -5370,8 +5408,9 @@ Q_STATIC_TEMPLATE_FUNCTION void blendTransformedBilinear(int count, const QSpan
                     int y1 = (y >> 16);
                     int y2 = y1 + 1;
 
-                    const int distx = ((x - (x1 << 16)) >> 8);
-                    const int disty = ((y - (y1 << 16)) >> 8);
+                    const int distx = (x & 0x0000ffff) >> 8;
+                    const int disty = (y & 0x0000ffff) >> 8;
+
                     x1 = qBound(src_minx, x1, src_maxx);
                     x2 = qBound(src_minx, x2, src_maxx);
                     y1 = qBound(src_miny, y1, src_maxy);
@@ -5646,197 +5685,6 @@ static void blend_transformed_bilinear_rgb444(int count, const QSpan *spans, voi
 }
 
 template <SpanMethod spanMethod>
-Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_bilinear_tiled_argb(int count, const QSpan *spans, void *userData)
-{
-    QSpanData *data = reinterpret_cast<QSpanData *>(userData);
-    if (data->texture.format != QImage::Format_ARGB32_Premultiplied
-        && data->texture.format != QImage::Format_RGB32) {
-        blend_src_generic<spanMethod>(count, spans, userData);
-        return;
-    }
-
-    CompositionFunction func = functionForMode[data->rasterBuffer->compositionMode];
-    uint buffer[buffer_size];
-
-    int image_width = data->texture.width;
-    int image_height = data->texture.height;
-    const int scanline_offset = data->texture.bytesPerLine / 4;
-
-    if (data->fast_matrix) {
-        // The increment pr x in the scanline
-        int fdx = (int)(data->m11 * fixed_scale);
-        int fdy = (int)(data->m12 * fixed_scale);
-
-        while (count--) {
-            void *t = data->rasterBuffer->scanLine(spans->y);
-
-            uint *target = ((uint *)t) + spans->x;
-            uint *image_bits = (uint *)data->texture.imageData;
-
-            const qreal cx = spans->x + 0.5;
-            const qreal cy = spans->y + 0.5;
-
-            int x = int((data->m21 * cy
-                         + data->m11 * cx + data->dx) * fixed_scale) - half_point;
-            int y = int((data->m22 * cy
-                         + data->m12 * cx + data->dy) * fixed_scale) - half_point;
-
-            int length = spans->len;
-            const int coverage = (spans->coverage * data->texture.const_alpha) >> 8;
-            while (length) {
-                int l = qMin(length, buffer_size);
-                const uint *end = buffer + l;
-                uint *b = buffer;
-                while (b < end) {
-                    int x1 = (x >> 16);
-                    int x2 = (x1 + 1);
-                    int y1 = (y >> 16);
-                    int y2 = (y1 + 1);
-
-                    int distx = ((x - (x1 << 16)) >> 8);
-                    int disty = ((y - (y1 << 16)) >> 8);
-                    int idistx = 256 - distx;
-                    int idisty = 256 - disty;
-
-                    x1 %= image_width;
-                    x2 %= image_width;
-                    y1 %= image_height;
-                    y2 %= image_height;
-
-                    if (x1 < 0) x1 += image_width;
-                    if (x2 < 0) x2 += image_width;
-                    if (y1 < 0) y1 += image_height;
-                    if (y2 < 0) y2 += image_height;
-
-                    Q_ASSERT(x1 >= 0 && x1 < image_width);
-                    Q_ASSERT(x2 >= 0 && x2 < image_width);
-                    Q_ASSERT(y1 >= 0 && y1 < image_height);
-                    Q_ASSERT(y2 >= 0 && y2 < image_height);
-
-                    int y1_offset = y1 * scanline_offset;
-                    int y2_offset = y2 * scanline_offset;
-
-#if defined(Q_IRIX_GCC3_3_WORKAROUND)
-                    uint tl = gccBug(image_bits[y1_offset + x1]);
-                    uint tr = gccBug(image_bits[y1_offset + x2]);
-                    uint bl = gccBug(image_bits[y2_offset + x1]);
-                    uint br = gccBug(image_bits[y2_offset + x2]);
-#else
-                    uint tl = image_bits[y1_offset + x1];
-                    uint tr = image_bits[y1_offset + x2];
-                    uint bl = image_bits[y2_offset + x1];
-                    uint br = image_bits[y2_offset + x2];
-#endif
-
-                    uint xtop = INTERPOLATE_PIXEL_256(tl, idistx, tr, distx);
-                    uint xbot = INTERPOLATE_PIXEL_256(bl, idistx, br, distx);
-                    *b = INTERPOLATE_PIXEL_256(xtop, idisty, xbot, disty);
-                    ++b;
-                    x += fdx;
-                    y += fdy;
-                }
-                if (spanMethod == RegularSpans)
-                    func(target, buffer, l, coverage);
-                else
-                    drawBufferSpan(data, buffer, buffer_size,
-                                   spans->x + spans->len - length,
-                                   spans->y, l, coverage);
-                target += l;
-                length -= l;
-            }
-            ++spans;
-        }
-    } else {
-        const qreal fdx = data->m11;
-        const qreal fdy = data->m12;
-        const qreal fdw = data->m13;
-        while (count--) {
-            void *t = data->rasterBuffer->scanLine(spans->y);
-
-            uint *target = ((uint *)t) + spans->x;
-            uint *image_bits = (uint *)data->texture.imageData;
-
-            const qreal cx = spans->x + 0.5;
-            const qreal cy = spans->y + 0.5;
-
-            qreal x = data->m21 * cy + data->m11 * cx + data->dx;
-            qreal y = data->m22 * cy + data->m12 * cx + data->dy;
-            qreal w = data->m23 * cy + data->m13 * cx + data->m33;
-
-            int length = spans->len;
-            const int coverage = (spans->coverage * data->texture.const_alpha) >> 8;
-            while (length) {
-                int l = qMin(length, buffer_size);
-                const uint *end = buffer + l;
-                uint *b = buffer;
-                while (b < end) {
-                    const qreal iw = w == 0 ? 1 : 1 / w;
-                    const qreal px = x * iw - 0.5;
-                    const qreal py = y * iw - 0.5;
-
-                    int x1 = int(px) - (px < 0);
-                    int x2 = x1 + 1;
-                    int y1 = int(py) - (py < 0);
-                    int y2 = y1 + 1;
-
-                    int distx = int((px - x1) * 256);
-                    int disty = int((py - y1) * 256);
-                    int idistx = 256 - distx;
-                    int idisty = 256 - disty;
-
-                    x1 %= image_width;
-                    x2 %= image_width;
-                    y1 %= image_height;
-                    y2 %= image_height;
-
-                    if (x1 < 0) x1 += image_width;
-                    if (x2 < 0) x2 += image_width;
-                    if (y1 < 0) y1 += image_height;
-                    if (y2 < 0) y2 += image_height;
-
-                    Q_ASSERT(x1 >= 0 && x1 < image_width);
-                    Q_ASSERT(x2 >= 0 && x2 < image_width);
-                    Q_ASSERT(y1 >= 0 && y1 < image_height);
-                    Q_ASSERT(y2 >= 0 && y2 < image_height);
-
-                    int y1_offset = y1 * scanline_offset;
-                    int y2_offset = y2 * scanline_offset;
-
-#if defined(Q_IRIX_GCC3_3_WORKAROUND)
-                    uint tl = gccBug(image_bits[y1_offset + x1]);
-                    uint tr = gccBug(image_bits[y1_offset + x2]);
-                    uint bl = gccBug(image_bits[y2_offset + x1]);
-                    uint br = gccBug(image_bits[y2_offset + x2]);
-#else
-                    uint tl = image_bits[y1_offset + x1];
-                    uint tr = image_bits[y1_offset + x2];
-                    uint bl = image_bits[y2_offset + x1];
-                    uint br = image_bits[y2_offset + x2];
-#endif
-
-                    uint xtop = INTERPOLATE_PIXEL_256(tl, idistx, tr, distx);
-                    uint xbot = INTERPOLATE_PIXEL_256(bl, idistx, br, distx);
-                    *b = INTERPOLATE_PIXEL_256(xtop, idisty, xbot, disty);
-                    ++b;
-                    x += fdx;
-                    y += fdy;
-                    w += fdw;
-                }
-                if (spanMethod == RegularSpans)
-                    func(target, buffer, l, coverage);
-                else
-                    drawBufferSpan(data, buffer, buffer_size,
-                                   spans->x + spans->len - length,
-                                   spans->y, l, coverage);
-                target += l;
-                length -= l;
-            }
-            ++spans;
-        }
-    }
-}
-
-template <SpanMethod spanMethod>
 Q_STATIC_TEMPLATE_FUNCTION void blend_transformed_argb(int count, const QSpan *spans, void *userData)
 {
     QSpanData *data = reinterpret_cast<QSpanData *>(userData);
@@ -6738,7 +6586,7 @@ static const ProcessSpans processTextureSpans[NBlendTypes][QImage::NImageFormats
         SPANFUNC_POINTER(blend_src_generic, RegularSpans), // Indexed8
         SPANFUNC_POINTER(blend_src_generic, RegularSpans), // RGB32
         SPANFUNC_POINTER(blend_src_generic, RegularSpans), // ARGB32
-        SPANFUNC_POINTER(blend_transformed_bilinear_argb, RegularSpans), // ARGB32_Premultiplied
+        blend_transformed_bilinear_argb<RegularSpans, BlendTransformedBilinear>, // ARGB32_Premultiplied
         blend_transformed_bilinear_rgb565,
         blend_transformed_bilinear_argb8565,
         blend_transformed_bilinear_rgb666,
@@ -6757,7 +6605,7 @@ static const ProcessSpans processTextureSpans[NBlendTypes][QImage::NImageFormats
         SPANFUNC_POINTER(blend_src_generic, RegularSpans), // Indexed8
         SPANFUNC_POINTER(blend_src_generic, RegularSpans), // RGB32
         SPANFUNC_POINTER(blend_src_generic, RegularSpans), // ARGB32
-        SPANFUNC_POINTER(blend_transformed_bilinear_tiled_argb, RegularSpans), // ARGB32_Premultiplied
+        blend_transformed_bilinear_argb<RegularSpans, BlendTransformedBilinearTiled>, // ARGB32_Premultiplied
         SPANFUNC_POINTER(blend_src_generic, RegularSpans), // RGB16
         SPANFUNC_POINTER(blend_src_generic, RegularSpans), // ARGB8565_Premultiplied
         SPANFUNC_POINTER(blend_src_generic, RegularSpans), // RGB666
@@ -6856,7 +6704,7 @@ static const ProcessSpans processTextureSpansCallback[NBlendTypes][QImage::NImag
         blend_src_generic<CallbackSpans>,   // Indexed8
         blend_src_generic<CallbackSpans>,   // RGB32
         blend_src_generic<CallbackSpans>,   // ARGB32
-        blend_transformed_bilinear_argb<CallbackSpans>, // ARGB32_Premultiplied
+        blend_transformed_bilinear_argb<CallbackSpans, BlendTransformedBilinear>, // ARGB32_Premultiplied
         blend_src_generic<CallbackSpans>,   // RGB16
         blend_src_generic<CallbackSpans>,   // ARGB8565_Premultiplied
         blend_src_generic<CallbackSpans>,   // RGB666
@@ -6875,7 +6723,7 @@ static const ProcessSpans processTextureSpansCallback[NBlendTypes][QImage::NImag
         blend_src_generic<CallbackSpans>,   // Indexed8
         blend_src_generic<CallbackSpans>,   // RGB32
         blend_src_generic<CallbackSpans>,   // ARGB32
-        blend_transformed_bilinear_tiled_argb<CallbackSpans>, // ARGB32_Premultiplied
+        blend_transformed_bilinear_argb<CallbackSpans, BlendTransformedBilinearTiled>, // ARGB32_Premultiplied
         blend_src_generic<CallbackSpans>,   // RGB16
         blend_src_generic<CallbackSpans>,   // ARGB8565_Premultiplied
         blend_src_generic<CallbackSpans>,   // RGB666
@@ -7135,6 +6983,11 @@ void qt_build_pow_tables() {
     int winSmooth;
     if (SystemParametersInfo(0x200C /* SPI_GETFONTSMOOTHINGCONTRAST */, 0, &winSmooth, 0))
         smoothing = winSmooth / 1000.0;
+
+    // Safeguard ourselves against corrupt registry values...
+    if (smoothing > 5 || smoothing < 1)
+        smoothing = 1.4;
+
 #endif
 
 #ifdef Q_WS_X11
diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp
index 949a820..00e74ba 100644
--- a/src/gui/painting/qpathclipper.cpp
+++ b/src/gui/painting/qpathclipper.cpp
@@ -935,10 +935,9 @@ qreal QWingedEdge::delta(int vertex, int a, int b) const
 
     qreal result = b_angle - a_angle;
 
-    if (qFuzzyIsNull(result) || qFuzzyCompare(result, 128))
-        return 0;
-
-    if (result < 0)
+    if (result >= 128.)
+        return result - 128.;
+    else if (result < 0)
         return result + 128.;
     else
         return result;
diff --git a/src/gui/styles/qgtkstyle_p.h b/src/gui/styles/qgtkstyle_p.h
index 5bb7550..68a04e9 100644
--- a/src/gui/styles/qgtkstyle_p.h
+++ b/src/gui/styles/qgtkstyle_p.h
@@ -85,9 +85,14 @@ public:
     int size() const { return m_size; }
     const char *data() const { return m_data; }
 
+#ifdef __SUNPRO_CC
+        QHashableLatin1Literal(const char* str)
+        : m_size(strlen(str)), m_data(str) {}
+#else
     template <int N>
         QHashableLatin1Literal(const char (&str)[N])
         : m_size(N - 1), m_data(str) {}
+#endif
 
     QHashableLatin1Literal(const QHashableLatin1Literal &other)
         : m_size(other.m_size), m_data(other.m_data)
diff --git a/src/gui/text/qfont.cpp b/src/gui/text/qfont.cpp
index 99b9f40..cb16a16 100644
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
@@ -2614,8 +2614,10 @@ void QFontCache::cleanup()
     } QT_CATCH (const std::bad_alloc &) {
         // no cache - just ignore
     }
-    if (cache && cache->hasLocalData())
+    if (cache && cache->hasLocalData()) {
+        cache->localData()->clear();
         cache->setLocalData(0);
+        }
 }
 #endif // QT_NO_THREAD
 
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp
index b1ab478..3b2e4e9 100644
--- a/src/gui/text/qfontdatabase_x11.cpp
+++ b/src/gui/text/qfontdatabase_x11.cpp
@@ -1939,8 +1939,13 @@ void QFontDatabase::load(const QFontPrivate *d, int script)
             fe = loadFc(d, script, req);
 
             if (fe != 0 && fe->fontDef.pixelSize != req.pixelSize) {
-                delete fe;
-                fe = loadXlfd(d->screen, script, req);
+                QFontEngine *xlfdFontEngine = loadXlfd(d->screen, script, req);
+                if (xlfdFontEngine->fontDef.family == fe->fontDef.family) {
+                    delete fe;
+                    fe = xlfdFontEngine;
+                } else {
+                    delete xlfdFontEngine;
+                }
             }
 
 
diff --git a/src/gui/text/qfontengine_s60.cpp b/src/gui/text/qfontengine_s60.cpp
index 3ea084b..c9ff661 100644
--- a/src/gui/text/qfontengine_s60.cpp
+++ b/src/gui/text/qfontengine_s60.cpp
@@ -79,6 +79,31 @@ QByteArray QFontEngineS60Extensions::getSfntTable(uint tag) const
     return result;
 }
 
+bool QFontEngineS60Extensions::getSfntTableData(uint tag, uchar *buffer, uint *length) const
+{
+    if (!m_trueTypeExtension->HasTrueTypeTable(tag))
+        return false;
+
+    bool result = true;
+    TInt error = KErrNone;
+    TInt tableByteLength;
+    TAny *table =
+        q_check_ptr(m_trueTypeExtension->GetTrueTypeTable(error, tag, &tableByteLength));
+
+    if (error != KErrNone) {
+        return false;
+    } else if (*length > 0 && *length < tableByteLength) {
+        result = false; // Caller did not allocate enough memory
+    } else {
+        *length = tableByteLength;
+        if (buffer)
+            qMemCopy(buffer, table, tableByteLength);
+    }
+
+    m_trueTypeExtension->ReleaseTrueTypeTable(table);
+    return result;
+}
+
 const unsigned char *QFontEngineS60Extensions::cmap() const
 {
     if (!m_cmap) {
@@ -326,6 +351,11 @@ QByteArray QFontEngineS60::getSfntTable(uint tag) const
     return m_extensions->getSfntTable(tag);
 }
 
+bool QFontEngineS60::getSfntTableData(uint tag, uchar *buffer, uint *length) const
+{
+    return m_extensions->getSfntTableData(tag, buffer, length);
+}
+
 QFontEngine::Type QFontEngineS60::type() const
 {
     return QFontEngine::S60FontEngine;
diff --git a/src/gui/text/qfontengine_s60_p.h b/src/gui/text/qfontengine_s60_p.h
index 5834cc4..a80af4d 100644
--- a/src/gui/text/qfontengine_s60_p.h
+++ b/src/gui/text/qfontengine_s60_p.h
@@ -69,6 +69,7 @@ public:
     QFontEngineS60Extensions(CFont* fontOwner, COpenFont *font);
 
     QByteArray getSfntTable(uint tag) const;
+    bool getSfntTableData(uint tag, uchar *buffer, uint *length) const;
     const unsigned char *cmap() const;
     QPainterPath glyphOutline(glyph_t glyph) const;
     CFont *fontOwner() const;
@@ -106,6 +107,7 @@ public:
     qreal minRightBearing() const { return 0; }
 
     QByteArray getSfntTable(uint tag) const;
+    bool getSfntTableData(uint tag, uchar *buffer, uint *length) const;
 
     static qreal pixelsToPoints(qreal pixels, Qt::Orientation orientation = Qt::Horizontal);
     static qreal pointsToPixels(qreal points, Qt::Orientation orientation = Qt::Horizontal);
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 7dc2c26..6485966 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1647,7 +1647,7 @@ glyph_metrics_t QTextEngine::boundingBox(int from,  int len) const
                 }
             }
 
-            glyph_t glyph = glyphs.glyphs[logClusters[pos + ilen - 1]];
+            glyph_t glyph = glyphs.glyphs[logClusters[ilen - 1]];
             glyph_metrics_t gi = fe->boundingBox(glyph);
             if (gi.isValid())
                 gm.width -= qRound(gi.xoff - gi.x - gi.width);
diff --git a/src/gui/util/qcompleter.cpp b/src/gui/util/qcompleter.cpp
index c095b3b..8e7ec80 100644
--- a/src/gui/util/qcompleter.cpp
+++ b/src/gui/util/qcompleter.cpp
@@ -1689,8 +1689,10 @@ QString QCompleter::pathFromIndex(const QModelIndex& index) const
         QString t;
         if (isDirModel)
             t = sourceModel->data(idx, Qt::EditRole).toString();
+#ifndef QT_NO_FILESYSTEMMODEL
         else
             t = sourceModel->data(idx, QFileSystemModel::FileNameRole).toString();
+#endif
         list.prepend(t);
         QModelIndex parent = idx.parent();
         idx = parent.sibling(parent.row(), index.column());
diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp
index cc74a53..732dbc9 100644
--- a/src/gui/widgets/qdialogbuttonbox.cpp
+++ b/src/gui/widgets/qdialogbuttonbox.cpp
@@ -258,6 +258,7 @@ static const int layouts[2][5][14] =
     }
 };
 
+#if defined(QT_SOFTKEYS_ENABLED) && !defined(QT_NO_ACTION)
 class QDialogButtonEnabledProxy : public QObject
 {
 public:
@@ -281,7 +282,7 @@ private:
     QWidget *source;
     QAction *target;
 };
-
+#endif
 
 class QDialogButtonBoxPrivate : public QWidgetPrivate
 {
@@ -314,7 +315,7 @@ public:
     void addButtonsToLayout(const QList<QAbstractButton *> &buttonList, bool reverse);
     void retranslateStrings();
     const char *standardButtonText(QDialogButtonBox::StandardButton sbutton) const;
-#ifdef QT_SOFTKEYS_ENABLED
+#if defined(QT_SOFTKEYS_ENABLED) && !defined(QT_NO_ACTION)
     QAction *createSoftKey(QAbstractButton *button, QDialogButtonBox::ButtonRole role);
 #endif
 };
@@ -571,7 +572,7 @@ void QDialogButtonBoxPrivate::addButton(QAbstractButton *button, QDialogButtonBo
     QObject::connect(button, SIGNAL(clicked()), q, SLOT(_q_handleButtonClicked()));
     QObject::connect(button, SIGNAL(destroyed()), q, SLOT(_q_handleButtonDestroyed()));
     buttonLists[role].append(button);
-#ifdef QT_SOFTKEYS_ENABLED
+#if defined(QT_SOFTKEYS_ENABLED) && !defined(QT_NO_ACTION)
     QAction *action = createSoftKey(button, role);
     softKeyActions.insert(button, action);
     new QDialogButtonEnabledProxy(action, button, action);
@@ -580,7 +581,7 @@ void QDialogButtonBoxPrivate::addButton(QAbstractButton *button, QDialogButtonBo
         layoutButtons();
 }
 
-#ifdef QT_SOFTKEYS_ENABLED
+#if defined(QT_SOFTKEYS_ENABLED) && !defined(QT_NO_ACTION)
 QAction* QDialogButtonBoxPrivate::createSoftKey(QAbstractButton *button, QDialogButtonBox::ButtonRole role)
 {
     Q_Q(QDialogButtonBox);
@@ -718,7 +719,7 @@ void QDialogButtonBoxPrivate::retranslateStrings()
         if (buttonText) {
             QPushButton *button = it.key();
             button->setText(QDialogButtonBox::tr(buttonText));
-#ifdef QT_SOFTKEYS_ENABLED
+#if defined(QT_SOFTKEYS_ENABLED) && !defined(QT_NO_ACTION)
             QAction *action = softKeyActions.value(button, 0);
             if (action)
                 action->setText(button->text());
@@ -997,7 +998,7 @@ void QDialogButtonBox::removeButton(QAbstractButton *button)
             }
         }
     }
-#ifdef QT_SOFTKEYS_ENABLED
+#if defined(QT_SOFTKEYS_ENABLED) && !defined(QT_NO_ACTION)
     QAction *action = d->softKeyActions.value(button, 0);
     if (action) {
         d->softKeyActions.remove(button);
@@ -1243,7 +1244,7 @@ bool QDialogButtonBox::event(QEvent *event)
     }else if (event->type() == QEvent::LanguageChange) {
         d->retranslateStrings();
     }
-#ifdef QT_SOFTKEYS_ENABLED
+#if defined(QT_SOFTKEYS_ENABLED) && !defined(QT_NO_ACTION)
     else if (event->type() == QEvent::ParentChange) {
         QWidget *dialog = 0;
         QWidget *p = this;
diff --git a/src/gui/widgets/qframe.cpp b/src/gui/widgets/qframe.cpp
index c2e4b35..f51ddfd 100644
--- a/src/gui/widgets/qframe.cpp
+++ b/src/gui/widgets/qframe.cpp
@@ -244,7 +244,7 @@ QFrame::~QFrame()
 /*!
     Returns the frame style.
 
-    The default value is QFrame::NoFrame.
+    The default value is QFrame::Plain.
 
     \sa setFrameStyle(), frameShape(), frameShadow()
 */
diff --git a/src/gui/widgets/qmenubar.cpp b/src/gui/widgets/qmenubar.cpp
index e368d3d..a13a2fa 100644
--- a/src/gui/widgets/qmenubar.cpp
+++ b/src/gui/widgets/qmenubar.cpp
@@ -268,19 +268,15 @@ void QMenuBarPrivate::updateGeometries()
 
 QRect QMenuBarPrivate::actionRect(QAction *act) const
 {
-    Q_Q(const QMenuBar);
     const int index = actions.indexOf(act);
-    if (index == -1)
-        return QRect();
 
     //makes sure the geometries are up-to-date
     const_cast<QMenuBarPrivate*>(this)->updateGeometries();
 
-    if (index >= actionRects.count())
+    if (index < 0 || index >= actionRects.count())
         return QRect(); // that can happen in case of native menubar
 
-    QRect ret = actionRects.at(index);
-    return QStyle::visualRect(q->layoutDirection(), q->rect(), ret);
+    return actionRects.at(index);
 }
 
 void QMenuBarPrivate::focusFirstAction()
@@ -505,6 +501,9 @@ void QMenuBarPrivate::calcActionRects(int max_width, int start) const
 
         //keep moving along..
         x += rect.width() + itemSpacing;
+
+        //make sure we follow the layout direction
+        rect = QStyle::visualRect(q->layoutDirection(), q->rect(), rect);
     }
 }
 
diff --git a/src/gui/widgets/qsizegrip.cpp b/src/gui/widgets/qsizegrip.cpp
index c9d613a..40f3129 100644
--- a/src/gui/widgets/qsizegrip.cpp
+++ b/src/gui/widgets/qsizegrip.cpp
@@ -78,15 +78,6 @@ static QWidget *qt_sizegrip_topLevelWidget(QWidget* w)
     return w;
 }
 
-static inline bool hasHeightForWidth(QWidget *widget)
-{
-    if (!widget)
-        return false;
-    if (QLayout *layout = widget->layout())
-        return layout->hasHeightForWidth();
-    return widget->sizePolicy().hasHeightForWidth();
-}
-
 class QSizeGripPrivate : public QWidgetPrivate
 {
     Q_DECLARE_PUBLIC(QSizeGrip)
@@ -318,7 +309,7 @@ void QSizeGrip::mousePressEvent(QMouseEvent * e)
 #ifdef Q_WS_X11
     // Use a native X11 sizegrip for "real" top-level windows if supported.
     if (tlw->isWindow() && X11->isSupportedByWM(ATOM(_NET_WM_MOVERESIZE))
-        && !tlw->testAttribute(Qt::WA_DontShowOnScreen) && !hasHeightForWidth(tlw)) {
+        && !tlw->testAttribute(Qt::WA_DontShowOnScreen) && !tlw->hasHeightForWidth()) {
         XEvent xev;
         xev.xclient.type = ClientMessage;
         xev.xclient.message_type = ATOM(_NET_WM_MOVERESIZE);
@@ -340,7 +331,7 @@ void QSizeGrip::mousePressEvent(QMouseEvent * e)
     }
 #endif // Q_WS_X11
 #ifdef Q_WS_WIN
-    if (tlw->isWindow() && !tlw->testAttribute(Qt::WA_DontShowOnScreen) && !hasHeightForWidth(tlw)) {
+    if (tlw->isWindow() && !tlw->testAttribute(Qt::WA_DontShowOnScreen) && !tlw->hasHeightForWidth()) {
         uint orientation = 0;
         if (d->atBottom())
             orientation = d->atLeft() ? SZ_SIZEBOTTOMLEFT : SZ_SIZEBOTTOMRIGHT;
@@ -429,12 +420,12 @@ void QSizeGrip::mouseMoveEvent(QMouseEvent * e)
 
 #ifdef Q_WS_X11
     if (tlw->isWindow() && X11->isSupportedByWM(ATOM(_NET_WM_MOVERESIZE))
-        && tlw->isTopLevel() && !tlw->testAttribute(Qt::WA_DontShowOnScreen) && !hasHeightForWidth(tlw))
+        && tlw->isTopLevel() && !tlw->testAttribute(Qt::WA_DontShowOnScreen) && !tlw->hasHeightForWidth())
         return;
 #endif
 #ifdef Q_WS_WIN
     if (tlw->isWindow() && GetSystemMenu(tlw->winId(), FALSE) != 0 && internalWinId()
-        && !tlw->testAttribute(Qt::WA_DontShowOnScreen) && !hasHeightForWidth(tlw)) {
+        && !tlw->testAttribute(Qt::WA_DontShowOnScreen) && !tlw->hasHeightForWidth()) {
         MSG msg;
         while(PeekMessage(&msg, winId(), WM_MOUSEMOVE, WM_MOUSEMOVE, PM_REMOVE));
         return;
diff --git a/src/gui/widgets/qtabwidget.cpp b/src/gui/widgets/qtabwidget.cpp
index 047a905..fb7ca64 100644
--- a/src/gui/widgets/qtabwidget.cpp
+++ b/src/gui/widgets/qtabwidget.cpp
@@ -195,6 +195,7 @@ public:
     void _q_removeTab(int);
     void _q_tabMoved(int from, int to);
     void init();
+    bool hasHeightForWidth() const;
 
     QTabBar *tabs;
     QStackedWidget *stack;
@@ -871,6 +872,46 @@ QSize QTabWidget::minimumSizeHint() const
                     .expandedTo(QApplication::globalStrut());
 }
 
+int QTabWidget::heightForWidth(int width) const
+{
+    Q_D(const QTabWidget);
+    QStyleOption opt(0);
+    opt.init(this);
+    opt.state = QStyle::State_None;
+
+    QSize zero(0,0);
+    const QSize padding = style()->sizeFromContents(QStyle::CT_TabWidget, &opt, zero, this)
+                                  .expandedTo(QApplication::globalStrut());
+
+    QSize lc(0, 0), rc(0, 0);
+    if (d->leftCornerWidget)
+        lc = d->leftCornerWidget->sizeHint();
+    if(d->rightCornerWidget)
+        rc = d->rightCornerWidget->sizeHint();
+    if (!d->dirty) {
+        QTabWidget *that = (QTabWidget*)this;
+        that->setUpLayout(true);
+    }
+    QSize t(d->tabs->sizeHint());
+
+    if(usesScrollButtons())
+        t = t.boundedTo(QSize(200,200));
+    else
+        t = t.boundedTo(QApplication::desktop()->size());
+
+    const bool tabIsHorizontal = (d->pos == North || d->pos == South);
+    const int contentsWidth = width - padding.width();
+    int stackWidth = contentsWidth;
+    if (!tabIsHorizontal)
+        stackWidth -= qMax(t.width(), qMax(lc.width(), rc.width()));
+
+    int stackHeight = d->stack->heightForWidth(stackWidth);
+    QSize s(stackWidth, stackHeight);
+
+    QSize contentSize = basicSize(tabIsHorizontal, lc, rc, s, t);
+    return (contentSize + padding).expandedTo(QApplication::globalStrut()).height();
+}
+
 /*!
     \reimp
  */
@@ -903,6 +944,14 @@ void QTabWidgetPrivate::updateTabBarPosition()
     q->setUpLayout();
 }
 
+bool QTabWidgetPrivate::hasHeightForWidth() const
+{
+    bool has = size_policy.hasHeightForWidth();
+    if (!has && stack)
+        has = stack->hasHeightForWidth();
+    return has;
+}
+
 /*!
     \property QTabWidget::tabPosition
     \brief the position of the tabs in this tab widget
diff --git a/src/gui/widgets/qtabwidget.h b/src/gui/widgets/qtabwidget.h
index 68200c8..ee50655 100644
--- a/src/gui/widgets/qtabwidget.h
+++ b/src/gui/widgets/qtabwidget.h
@@ -129,6 +129,7 @@ public:
 
     QSize sizeHint() const;
     QSize minimumSizeHint() const;
+    int heightForWidth(int width) const;
 
     void setCornerWidget(QWidget * w, Qt::Corner corner = Qt::TopRightCorner);
     QWidget * cornerWidget(Qt::Corner corner = Qt::TopRightCorner) const;
diff --git a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
index 67dc90c..aee0807 100644
--- a/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
+++ b/src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp
@@ -78,6 +78,8 @@ QAudioDeviceInfoInternal::QAudioDeviceInfoInternal(QByteArray dev, QAudio::Mode
 {
     device = QLatin1String(dev);
     this->mode = mode;
+
+    updateLists();
 }
 
 QAudioDeviceInfoInternal::~QAudioDeviceInfoInternal()
@@ -176,22 +178,70 @@ bool QAudioDeviceInfoInternal::testSettings(const QAudioFormat& format) const
     // See if what is in settings will work (return value).
 
     bool failed = false;
+    bool match = false;
 
-    // For now, just accept only audio/pcm codec
-    if(!format.codec().startsWith(QLatin1String("audio/pcm")))
-        failed = true;
+    // check codec
+    for( int i = 0; i < codecz.count(); i++) {
+        if (format.codec() == codecz.at(i))
+            match = true;
+    }
+    if (!match) failed = true;
+
+    // check channel
+    match = false;
+    if (!failed) {
+        for( int i = 0; i < channelz.count(); i++) {
+            if (format.channels() == channelz.at(i)) {
+                match = true;
+                break;
+            }
+        }
+    }
+    if (!match) failed = true;
+
+    // check frequency
+    match = false;
+    if (!failed) {
+        for( int i = 0; i < freqz.count(); i++) {
+            if (format.frequency() == freqz.at(i)) {
+                match = true;
+                break;
+            }
+        }
+    }
 
-    if(!failed && !(format.channels() == 1 || format.channels() == 2))
-        failed = true;
+    // check sample size
+    match = false;
+    if (!failed) {
+        for( int i = 0; i < sizez.count(); i++) {
+            if (format.sampleSize() == sizez.at(i)) {
+                match = true;
+                break;
+            }
+        }
+    }
 
-    if(!failed) {
-        if(!(format.frequency() == 8000 || format.frequency() == 11025 || format.frequency() == 22050 ||
-	   format.frequency() == 44100 || format.frequency() == 48000 || format.frequency() == 96000))
-	    failed = true;
+    // check byte order
+    match = false;
+    if (!failed) {
+        for( int i = 0; i < byteOrderz.count(); i++) {
+            if (format.byteOrder() == byteOrderz.at(i)) {
+                match = true;
+                break;
+            }
+        }
     }
 
-    if(!failed && !(format.sampleSize() == 8 || format.sampleSize() == 16))
-        failed = true;
+    // check sample type
+    match = false;
+    if (!failed) {
+        for( int i = 0; i < typez.count(); i++) {
+            if (format.sampleType() == typez.at(i)) {
+                match = true;
+                break;
+            }
+        }
+    }
 
     if(!failed) {
         // settings work
@@ -332,6 +382,8 @@ void QAudioDeviceInfoInternal::updateLists()
 
 	codecz.append(QLatin1String("audio/pcm"));
     }
+    if (freqz.count() > 0)
+        freqz.prepend(8000);
 }
 
 QList<QByteArray> QAudioDeviceInfoInternal::availableDevices(QAudio::Mode mode)
diff --git a/src/multimedia/audio/qaudioinput_alsa_p.cpp b/src/multimedia/audio/qaudioinput_alsa_p.cpp
index ead9995..6b15008 100644
--- a/src/multimedia/audio/qaudioinput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudioinput_alsa_p.cpp
@@ -428,7 +428,6 @@ bool QAudioInputPrivate::open()
 
 void QAudioInputPrivate::close()
 {
-    deviceState = QAudio::StoppedState;
     timer->stop();
 
     if ( handle ) {
diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp
index 180cbda..b5d673e 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.cpp
+++ b/src/multimedia/audio/qaudioinput_win32_p.cpp
@@ -57,8 +57,6 @@ QT_BEGIN_NAMESPACE
 
 //#define DEBUG_AUDIO 1
 
-static CRITICAL_SECTION waveInCriticalSection;
-
 static const int minimumIntervalTime = 50;
 
 QAudioInputPrivate::QAudioInputPrivate(const QByteArray &device, const QAudioFormat& audioFormat):
@@ -104,16 +102,16 @@ void QT_WIN_CALLBACK QAudioInputPrivate::waveInProc( HWAVEIN hWaveIn, UINT uMsg,
         case WIM_OPEN:
             break;
         case WIM_DATA:
-            EnterCriticalSection(&waveInCriticalSection);
+            EnterCriticalSection(&qAudio->waveInCriticalSection);
             if(qAudio->waveFreeBlockCount > 0)
                 qAudio->waveFreeBlockCount--;
             qAudio->feedback();
-            LeaveCriticalSection(&waveInCriticalSection);
+            LeaveCriticalSection(&qAudio->waveInCriticalSection);
             break;
         case WIM_CLOSE:
-            EnterCriticalSection(&waveInCriticalSection);
+            EnterCriticalSection(&qAudio->waveInCriticalSection);
             qAudio->finished = true;
-            LeaveCriticalSection(&waveInCriticalSection);
+            LeaveCriticalSection(&qAudio->waveInCriticalSection);
             break;
         default:
             return;
@@ -226,8 +224,8 @@ bool QAudioInputPrivate::open()
 #endif
     header = 0;
     if(buffer_size == 0) {
-        // Default buffer size, 100ms, default period size is 20ms
-        buffer_size = settings.frequency()*settings.channels()*(settings.sampleSize()/8)*0.1;
+        // Default buffer size, 200ms, default period size is 40ms
+        buffer_size = settings.frequency()*settings.channels()*(settings.sampleSize()/8)*0.2;
 	period_size = buffer_size/5;
     } else {
         period_size = buffer_size/5;
diff --git a/src/multimedia/audio/qaudioinput_win32_p.h b/src/multimedia/audio/qaudioinput_win32_p.h
index a2cf2ea..66c2535 100644
--- a/src/multimedia/audio/qaudioinput_win32_p.h
+++ b/src/multimedia/audio/qaudioinput_win32_p.h
@@ -122,6 +122,7 @@ private:
     volatile int waveFreeBlockCount;
     int waveCurrentBlock;
 
+    CRITICAL_SECTION waveInCriticalSection;
     static void QT_WIN_CALLBACK waveInProc( HWAVEIN hWaveIn, UINT uMsg,
             DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 );
 
diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
index 1cef335..cf3726b 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
@@ -485,7 +485,6 @@ bool QAudioOutputPrivate::open()
 
 void QAudioOutputPrivate::close()
 {
-    deviceState = QAudio::StoppedState;
     timer->stop();
 
     if ( handle ) {
@@ -701,6 +700,7 @@ bool QAudioOutputPrivate::deviceReady()
 
         } else if(l < 0) {
             close();
+            deviceState = QAudio::StoppedState;
             errorState = QAudio::IOError;
             emit stateChanged(deviceState);
         }
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp
index 4bcbd09..13bce58 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp
@@ -56,8 +56,6 @@
 
 QT_BEGIN_NAMESPACE
 
-static CRITICAL_SECTION waveOutCriticalSection;
-
 static const int minimumIntervalTime = 50;
 
 QAudioOutputPrivate::QAudioOutputPrivate(const QByteArray &device, const QAudioFormat& audioFormat):
@@ -107,16 +105,16 @@ void CALLBACK QAudioOutputPrivate::waveOutProc( HWAVEOUT hWaveOut, UINT uMsg,
         case WOM_CLOSE:
             return;
         case WOM_DONE:
-            EnterCriticalSection(&waveOutCriticalSection);
+            EnterCriticalSection(&qAudio->waveOutCriticalSection);
             if(qAudio->finished || qAudio->buffer_size == 0 || qAudio->period_size == 0) {
-                LeaveCriticalSection(&waveOutCriticalSection);
+                LeaveCriticalSection(&qAudio->waveOutCriticalSection);
                 return;
 	    }
             qAudio->waveFreeBlockCount++;
             if(qAudio->waveFreeBlockCount >= qAudio->buffer_size/qAudio->period_size)
                 qAudio->waveFreeBlockCount = qAudio->buffer_size/qAudio->period_size;
             qAudio->feedback();
-            LeaveCriticalSection(&waveOutCriticalSection);
+            LeaveCriticalSection(&qAudio->waveOutCriticalSection);
             break;
         default:
             return;
diff --git a/src/multimedia/audio/qaudiooutput_win32_p.h b/src/multimedia/audio/qaudiooutput_win32_p.h
index bb176a0..68a40f7 100644
--- a/src/multimedia/audio/qaudiooutput_win32_p.h
+++ b/src/multimedia/audio/qaudiooutput_win32_p.h
@@ -119,6 +119,8 @@ private:
     static void QT_WIN_CALLBACK waveOutProc( HWAVEOUT hWaveOut, UINT uMsg,
             DWORD dwInstance, DWORD dwParam1, DWORD dwParam2 );
 
+    CRITICAL_SECTION waveOutCriticalSection;
+
     WAVEHDR* allocateBlocks(int size, int count);
     void freeBlocks(WAVEHDR* blockArray);
     bool open();
diff --git a/src/multimedia/base/qgraphicsvideoitem.cpp b/src/multimedia/base/qgraphicsvideoitem.cpp
index d5ca9e8..f903eb7 100644
--- a/src/multimedia/base/qgraphicsvideoitem.cpp
+++ b/src/multimedia/base/qgraphicsvideoitem.cpp
@@ -410,9 +410,28 @@ void QGraphicsVideoItem::paint(
 */
 QVariant QGraphicsVideoItem::itemChange(GraphicsItemChange change, const QVariant &value)
 {
-    return QGraphicsItem::itemChange(change, value);
+    return QGraphicsObject::itemChange(change, value);
 }
 
-QT_END_NAMESPACE
+/*!
+    \reimp
 
+    \internal
+*/
+bool QGraphicsVideoItem::event(QEvent *event)
+{
+    return QGraphicsObject::event(event);
+}
+
+/*!
+    \reimp
+
+    \internal
+*/
+bool QGraphicsVideoItem::sceneEvent(QEvent *event)
+{
+    return QGraphicsObject::sceneEvent(event);
+}
+
+QT_END_NAMESPACE
 #include "moc_qgraphicsvideoitem.cpp"
diff --git a/src/multimedia/base/qgraphicsvideoitem.h b/src/multimedia/base/qgraphicsvideoitem.h
index c339606..e6f0d81 100644
--- a/src/multimedia/base/qgraphicsvideoitem.h
+++ b/src/multimedia/base/qgraphicsvideoitem.h
@@ -90,6 +90,9 @@ Q_SIGNALS:
     void nativeSizeChanged(const QSizeF &size);
 
 protected:
+    bool event(QEvent *event);
+    bool sceneEvent(QEvent *event);
+
     QVariant itemChange(GraphicsItemChange change, const QVariant &value);
 
     QGraphicsVideoItemPrivate *d_ptr;
diff --git a/src/network/access/qnetworkdiskcache.cpp b/src/network/access/qnetworkdiskcache.cpp
index ec6817a..cce6bd9 100644
--- a/src/network/access/qnetworkdiskcache.cpp
+++ b/src/network/access/qnetworkdiskcache.cpp
@@ -41,7 +41,6 @@
 
 //#define QNETWORKDISKCACHE_DEBUG
 
-#ifndef QT_NO_NETWORKDISKCACHE
 
 #include "qnetworkdiskcache.h"
 #include "qnetworkdiskcache_p.h"
@@ -60,6 +59,8 @@
 #define CACHE_POSTFIX QLatin1String(".cache")
 #define MAX_COMPRESSION_SIZE (1024 * 1024 * 3)
 
+#ifndef QT_NO_NETWORKDISKCACHE
+
 QT_BEGIN_NAMESPACE
 
 /*!
diff --git a/src/network/access/qnetworkdiskcache_p.h b/src/network/access/qnetworkdiskcache_p.h
index ad46602..b6df179 100644
--- a/src/network/access/qnetworkdiskcache_p.h
+++ b/src/network/access/qnetworkdiskcache_p.h
@@ -59,6 +59,8 @@
 #include <qhash.h>
 #include <qtemporaryfile.h>
 
+#ifndef QT_NO_NETWORKDISKCACHE
+
 QT_BEGIN_NAMESPACE
 
 class QFile;
@@ -119,4 +121,6 @@ public:
 
 QT_END_NAMESPACE
 
+#endif // QT_NO_NETWORKDISKCACHE
+
 #endif // QNETWORKDISKCACHE_P_H
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index a163fa9..f5ba2d6 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -217,7 +217,9 @@ void QGL2PaintEngineExPrivate::updateBrushTexture()
         const QPixmap& texPixmap = currentBrush.texture();
 
         glActiveTexture(GL_TEXTURE0 + QT_BRUSH_TEXTURE_UNIT);
-        QGLTexture *tex = ctx->d_func()->bindTexture(texPixmap, GL_TEXTURE_2D, GL_RGBA, QGLContext::InternalBindOption);
+        QGLTexture *tex = ctx->d_func()->bindTexture(texPixmap, GL_TEXTURE_2D, GL_RGBA,
+                                                     QGLContext::InternalBindOption |
+                                                     QGLContext::CanFlipNativePixmapBindOption);
         updateTextureFilter(GL_TEXTURE_2D, GL_REPEAT, q->state()->renderHints & QPainter::SmoothPixmapTransform);
         textureInvertedY = tex->options & QGLContext::InvertedYBindOption ? -1 : 1;
     }
diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
index d952988..16340a1 100644
--- a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
+++ b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp
@@ -111,7 +111,7 @@ void QTriangulatingStroker::process(const QVectorPath &path, const QPen &pen, co
     // depending on if the pen is cosmetic or not.
     //
     // The curvyness value of PI/14 was based on,
-    // arcLength=2*PI*r/4=PI/2 and splitting length into somewhere
+    // arcLength = 2*PI*r/4 = PI*r/2 and splitting length into somewhere
     // between 3 and 8 where 5 seemed to be give pretty good results
     // hence: Q_PI/14. Lower divisors will give more detail at the
     // direct cost of performance.
@@ -487,6 +487,8 @@ void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, c
     const QPainterPath::ElementType *types = path.elements();
     int count = path.elementCount();
 
+    bool cosmetic = pen.isCosmetic();
+
     m_points.reset();
     m_types.reset();
 
@@ -495,10 +497,26 @@ void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, c
         width = 1;
 
     m_dash_stroker.setDashPattern(pen.dashPattern());
-    m_dash_stroker.setStrokeWidth(pen.isCosmetic() ? width * m_inv_scale : width);
+    m_dash_stroker.setStrokeWidth(cosmetic ? width * m_inv_scale : width);
     m_dash_stroker.setMiterLimit(pen.miterLimit());
     m_dash_stroker.setClipRect(clip);
-    qreal curvyness = sqrt(width) * m_inv_scale / 8;
+
+    float curvynessAdd, curvynessMul, roundness = 0;
+
+    // simplfy pens that are thin in device size (2px wide or less)
+    if (width < 2.5 && (cosmetic || m_inv_scale == 1)) {
+        curvynessAdd = 0.5;
+        curvynessMul = CURVE_FLATNESS / m_inv_scale;
+        roundness = 1;
+    } else if (cosmetic) {
+        curvynessAdd= width / 2;
+        curvynessMul= CURVE_FLATNESS;
+        roundness = qMax<int>(4, width * CURVE_FLATNESS);
+    } else {
+        curvynessAdd = width * m_inv_scale;
+        curvynessMul = CURVE_FLATNESS / m_inv_scale;
+        roundness = qMax<int>(4, width * curvynessMul);
+    }
 
     if (count < 2)
         return;
@@ -533,9 +551,11 @@ void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, c
                                                 *(((const QPointF *) pts) + 1),
                                                 *(((const QPointF *) pts) + 2));
                 QRectF bounds = b.bounds();
-                int threshold = qMin<float>(64, qMax(bounds.width(), bounds.height()) * curvyness);
+                float rad = qMax(bounds.width(), bounds.height());
+                int threshold = qMin<float>(64, (rad + curvynessAdd) * curvynessMul);
                 if (threshold < 4)
                     threshold = 4;
+
                 qreal threshold_minus_1 = threshold - 1;
                 for (int i=0; i<threshold; ++i) {
                     QPointF pt = b.pointAt(i / threshold_minus_1);
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index e56b149..5595e02 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -2442,7 +2442,8 @@ QGLTexture *QGLContextPrivate::bindTexture(const QPixmap &pixmap, GLenum target,
     // Try to use texture_from_pixmap
     const QX11Info *xinfo = qt_x11Info(paintDevice);
     if (pd->classId() == QPixmapData::X11Class && pd->pixelType() == QPixmapData::PixmapType
-        && xinfo && xinfo->screen() == pixmap.x11Info().screen())
+        && xinfo && xinfo->screen() == pixmap.x11Info().screen()
+        && target == GL_TEXTURE_2D)
     {
         texture = bindTextureFromNativePixmap(const_cast<QPixmap*>(&pixmap), key, options);
         if (texture) {
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index e1a202f..d203646 100644
--- a/src/opengl/qgl_x11.cpp
+++ b/src/opengl/qgl_x11.cpp
@@ -1677,6 +1677,14 @@ QGLTexture *QGLContextPrivate::bindTextureFromNativePixmap(QPixmap *pixmap, cons
 #if !defined(GLX_VERSION_1_3) || defined(Q_OS_HPUX)
     return 0;
 #else
+
+    // Check we have GLX 1.3, as it is needed for glXCreatePixmap & glXDestroyPixmap
+    int majorVersion = 0;
+    int minorVersion = 0;
+    glXQueryVersion(X11->display, &majorVersion, &minorVersion);
+    if (majorVersion < 1 || (majorVersion == 1 && minorVersion < 3))
+        return 0;
+
     Q_Q(QGLContext);
 
     QX11PixmapData *pixmapData = static_cast<QX11PixmapData*>(pixmap->data_ptr().data());
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 55fd922..83b4b21 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -999,17 +999,18 @@ GLuint QGLShaderProgram::programId() const
     Any attributes that have not been explicitly bound when the program
     is linked will be assigned locations automatically.
 
+    When this function is called after the program has been linked,
+    the program will need to be relinked for the change to take effect.
+
     \sa attributeLocation()
 */
 void QGLShaderProgram::bindAttributeLocation(const char *name, int location)
 {
     Q_D(QGLShaderProgram);
-    if (!d->linked) {
-        glBindAttribLocation(d->programGuard.id(), location, name);
-    } else {
-        qWarning() << "QGLShaderProgram::bindAttributeLocation(" << name
-                   << "): cannot bind after shader program is linked";
-    }
+    if (!init())
+        return;
+    glBindAttribLocation(d->programGuard.id(), location, name);
+    d->linked = false;  // Program needs to be relinked.
 }
 
 /*!
@@ -1020,6 +1021,9 @@ void QGLShaderProgram::bindAttributeLocation(const char *name, int location)
     Any attributes that have not been explicitly bound when the program
     is linked will be assigned locations automatically.
 
+    When this function is called after the program has been linked,
+    the program will need to be relinked for the change to take effect.
+
     \sa attributeLocation()
 */
 void QGLShaderProgram::bindAttributeLocation(const QByteArray& name, int location)
@@ -1035,6 +1039,9 @@ void QGLShaderProgram::bindAttributeLocation(const QByteArray& name, int locatio
     Any attributes that have not been explicitly bound when the program
     is linked will be assigned locations automatically.
 
+    When this function is called after the program has been linked,
+    the program will need to be relinked for the change to take effect.
+
     \sa attributeLocation()
 */
 void QGLShaderProgram::bindAttributeLocation(const QString& name, int location)
diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c
index e6ac418..d05dd5d 100644
--- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c
+++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c
@@ -95,7 +95,7 @@ static int pvrQwsInitFbScreen(int screen)
     width = var.xres;
     height = var.yres;
     bytesPerPixel = var.bits_per_pixel / 8;
-    stride = var.xres * bytesPerPixel;
+    stride = fix.line_length;
     format = PVR2D_1BPP;
     if (var.bits_per_pixel == 16) {
         if (var.red.length == 5 && var.green.length == 6 &&
diff --git a/src/plugins/phonon/ds9/ds9.pro b/src/plugins/phonon/ds9/ds9.pro
index f40c561..301808e 100644
--- a/src/plugins/phonon/ds9/ds9.pro
+++ b/src/plugins/phonon/ds9/ds9.pro
@@ -22,7 +22,6 @@ HEADERS += \
            $$PHONON_DS9_DIR/mediaobject.h \
            $$PHONON_DS9_DIR/videowidget.h \
            $$PHONON_DS9_DIR/videorenderer_soft.h \
-           $$PHONON_DS9_DIR/videorenderer_vmr9.h \
            $$PHONON_DS9_DIR/volumeeffect.h \
            $$PHONON_DS9_DIR/qbasefilter.h \
            $$PHONON_DS9_DIR/qpin.h \
@@ -45,7 +44,6 @@ SOURCES += \
            $$PHONON_DS9_DIR/mediaobject.cpp \
            $$PHONON_DS9_DIR/videowidget.cpp \
            $$PHONON_DS9_DIR/videorenderer_soft.cpp \
-           $$PHONON_DS9_DIR/videorenderer_vmr9.cpp \
            $$PHONON_DS9_DIR/volumeeffect.cpp \
            $$PHONON_DS9_DIR/qbasefilter.cpp \
            $$PHONON_DS9_DIR/qpin.cpp \
@@ -53,6 +51,15 @@ SOURCES += \
            $$PHONON_DS9_DIR/qaudiocdreader.cpp \
            $$PHONON_DS9_DIR/qmeminputpin.cpp
 
+#the EVR renderer (only available on desktop)
+!wince*:SOURCES += $$PHONON_DS9_DIR/videorenderer_evr.cpp \
+                   $$PHONON_DS9_DIR/videorenderer_vmr9.cpp
+!wince*:HEADERS += $$PHONON_DS9_DIR/qevr9.h \
+                   $$PHONON_DS9_DIR/videorenderer_evr.h \
+                   $$PHONON_DS9_DIR/videorenderer_vmr9.h
+wince*:SOURCES  += $$PHONON_DS9_DIR/videorenderer_default.cpp
+wince*:HEADERS  += $$PHONON_DS9_DIR/videorenderer_default.h
+
 target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend
 INSTALLS += target
 
diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def
index df10406..cf7fe6f 100644
--- a/src/s60installs/bwins/QtCoreu.def
+++ b/src/s60installs/bwins/QtCoreu.def
@@ -4417,4 +4417,44 @@ EXPORTS
 	?QBasicAtomicInt_testAndSetRelease@@YA_NPCHHH@Z @ 4416 NONAME ; bool QBasicAtomicInt_testAndSetRelease(int volatile *, int, int)
 	?QBasicAtomicInt_fetchAndStoreAcquire@@YAHPCHH@Z @ 4417 NONAME ; int QBasicAtomicInt_fetchAndStoreAcquire(int volatile *, int)
 	?QBasicAtomicInt_fetchAndAddAcquire@@YAHPCHH@Z @ 4418 NONAME ; int QBasicAtomicInt_fetchAndAddAcquire(int volatile *, int)
+	??0QString@@QAE@PBVQChar@@@Z @ 4419 NONAME ; QString::QString(class QChar const *)
+	??0QTextDecoder@@QAE@PBVQTextCodec@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4420 NONAME ; QTextDecoder::QTextDecoder(class QTextCodec const *, class QFlags<enum QTextCodec::ConversionFlag>)
+	??0QTextEncoder@@QAE@PBVQTextCodec@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4421 NONAME ; QTextEncoder::QTextEncoder(class QTextCodec const *, class QFlags<enum QTextCodec::ConversionFlag>)
+	??0QVariant@@QAE@ABVQEasingCurve@@@Z @ 4422 NONAME ; QVariant::QVariant(class QEasingCurve const &)
+	??5@YAAAVQDataStream@@AAV0@AAVQEasingCurve@@@Z @ 4423 NONAME ; class QDataStream & operator>>(class QDataStream &, class QEasingCurve &)
+	??6@YAAAVQDataStream@@AAV0@ABVQEasingCurve@@@Z @ 4424 NONAME ; class QDataStream & operator<<(class QDataStream &, class QEasingCurve const &)
+	??8QElapsedTimer@@QBE_NABV0@@Z @ 4425 NONAME ; bool QElapsedTimer::operator==(class QElapsedTimer const &) const
+	??9QElapsedTimer@@QBE_NABV0@@Z @ 4426 NONAME ; bool QElapsedTimer::operator!=(class QElapsedTimer const &) const
+	??M@YA_NABVQElapsedTimer@@0@Z @ 4427 NONAME ; bool operator<(class QElapsedTimer const &, class QElapsedTimer const &)
+	?append@QListData@@QAEPAPAXH@Z @ 4428 NONAME ; void * * QListData::append(int)
+	?clearHistory@QStateMachinePrivate@@QAEXXZ @ 4429 NONAME ; void QStateMachinePrivate::clearHistory(void)
+	?clockType@QElapsedTimer@@SA?AW4ClockType@1@XZ @ 4430 NONAME ; enum QElapsedTimer::ClockType QElapsedTimer::clockType(void)
+	?currentDateTimeUtc@QDateTime@@SA?AV1@XZ @ 4431 NONAME ; class QDateTime QDateTime::currentDateTimeUtc(void)
+	?currentMSecsSinceEpoch@QDateTime@@SA_JXZ @ 4432 NONAME ; long long QDateTime::currentMSecsSinceEpoch(void)
+	?detach@QListData@@QAEPAUData@1@H@Z @ 4433 NONAME ; struct QListData::Data * QListData::detach(int)
+	?detach_grow@QListData@@QAEPAUData@1@PAHH@Z @ 4434 NONAME ; struct QListData::Data * QListData::detach_grow(int *, int)
+	?elapsed@QElapsedTimer@@QBE_JXZ @ 4435 NONAME ; long long QElapsedTimer::elapsed(void) const
+	?fromMSecsSinceEpoch@QDateTime@@SA?AV1@_J@Z @ 4436 NONAME ; class QDateTime QDateTime::fromMSecsSinceEpoch(long long)
+	?hasExpired@QElapsedTimer@@QBE_N_J@Z @ 4437 NONAME ; bool QElapsedTimer::hasExpired(long long) const
+	?invalidate@QElapsedTimer@@QAEXXZ @ 4438 NONAME ; void QElapsedTimer::invalidate(void)
+	?isMonotonic@QElapsedTimer@@SA_NXZ @ 4439 NONAME ; bool QElapsedTimer::isMonotonic(void)
+	?isSharedWith@QByteArray@@QBE_NABV1@@Z @ 4440 NONAME ; bool QByteArray::isSharedWith(class QByteArray const &) const
+	?isSharedWith@QString@@QBE_NABV1@@Z @ 4441 NONAME ; bool QString::isSharedWith(class QString const &) const
+	?isValid@QElapsedTimer@@QBE_NXZ @ 4442 NONAME ; bool QElapsedTimer::isValid(void) const
+	?makeDecoder@QTextCodec@@QBEPAVQTextDecoder@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4443 NONAME ; class QTextDecoder * QTextCodec::makeDecoder(class QFlags<enum QTextCodec::ConversionFlag>) const
+	?makeEncoder@QTextCodec@@QBEPAVQTextEncoder@@V?$QFlags@W4ConversionFlag@QTextCodec@@@@@Z @ 4444 NONAME ; class QTextEncoder * QTextCodec::makeEncoder(class QFlags<enum QTextCodec::ConversionFlag>) const
+	?msecsSinceReference@QElapsedTimer@@QBE_JXZ @ 4445 NONAME ; long long QElapsedTimer::msecsSinceReference(void) const
+	?msecsTo@QElapsedTimer@@QBE_JABV1@@Z @ 4446 NONAME ; long long QElapsedTimer::msecsTo(class QElapsedTimer const &) const
+	?qDecodeDataUrl@@YA?AU?$QPair@VQString@@VQByteArray@@@@ABVQUrl@@@Z @ 4447 NONAME ; struct QPair<class QString, class QByteArray> qDecodeDataUrl(class QUrl const &)
+	?qDetectCPUFeatures@@YAIXZ @ 4448 NONAME ; unsigned int qDetectCPUFeatures(void)
+	?registerStreamOperators@QMetaType@@SAXHP6AXAAVQDataStream@@PBX@ZP6AX0PAX@Z@Z @ 4449 NONAME ; void QMetaType::registerStreamOperators(int, void (*)(class QDataStream &, void const *), void (*)(class QDataStream &, void *))
+	?registerTypedef@QMetaType@@SAHPBDH@Z @ 4450 NONAME ; int QMetaType::registerTypedef(char const *, int)
+	?replace@QByteArray@@QAEAAV1@HHPBDH@Z @ 4451 NONAME ; class QByteArray & QByteArray::replace(int, int, char const *, int)
+	?restart@QElapsedTimer@@QAE_JXZ @ 4452 NONAME ; long long QElapsedTimer::restart(void)
+	?secsTo@QElapsedTimer@@QBE_JABV1@@Z @ 4453 NONAME ; long long QElapsedTimer::secsTo(class QElapsedTimer const &) const
+	?setMSecsSinceEpoch@QDateTime@@QAEX_J@Z @ 4454 NONAME ; void QDateTime::setMSecsSinceEpoch(long long)
+	?start@QElapsedTimer@@QAEXXZ @ 4455 NONAME ; void QElapsedTimer::start(void)
+	?toEasingCurve@QVariant@@QBE?AVQEasingCurve@@XZ @ 4456 NONAME ; class QEasingCurve QVariant::toEasingCurve(void) const
+	?toMSecsSinceEpoch@QDateTime@@QBE_JXZ @ 4457 NONAME ; long long QDateTime::toMSecsSinceEpoch(void) const
+	?transitions@QState@@QBE?AV?$QList@PAVQAbstractTransition@@@@XZ @ 4458 NONAME ; class QList<class QAbstractTransition *> QState::transitions(void) const
 
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index ba8d183..89049a9 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -20,17 +20,17 @@ EXPORTS
 	??0QDeclarativeComponent@@QAE@PAVQDeclarativeEngine@@PAVQObject@@@Z @ 19 NONAME ; QDeclarativeComponent::QDeclarativeComponent(class QDeclarativeEngine *, class QObject *)
 	??0QDeclarativeComponent@@QAE@PAVQObject@@@Z @ 20 NONAME ; QDeclarativeComponent::QDeclarativeComponent(class QObject *)
 	??0QDeclarativeConnections@@QAE@PAVQObject@@@Z @ 21 NONAME ; QDeclarativeConnections::QDeclarativeConnections(class QObject *)
-	??0QDeclarativeContext@@AAE@PAV0@PAVQObject@@_N@Z @ 22 NONAME ; QDeclarativeContext::QDeclarativeContext(class QDeclarativeContext *, class QObject *, bool)
+	??0QDeclarativeContext@@AAE@PAV0@PAVQObject@@_N@Z @ 22 NONAME ABSENT ; QDeclarativeContext::QDeclarativeContext(class QDeclarativeContext *, class QObject *, bool)
 	??0QDeclarativeContext@@AAE@PAVQDeclarativeEngine@@_N@Z @ 23 NONAME ; QDeclarativeContext::QDeclarativeContext(class QDeclarativeEngine *, bool)
 	??0QDeclarativeContext@@QAE@PAV0@PAVQObject@@@Z @ 24 NONAME ; QDeclarativeContext::QDeclarativeContext(class QDeclarativeContext *, class QObject *)
 	??0QDeclarativeContext@@QAE@PAVQDeclarativeEngine@@PAVQObject@@@Z @ 25 NONAME ; QDeclarativeContext::QDeclarativeContext(class QDeclarativeEngine *, class QObject *)
-	??0QDeclarativeContextPrivate@@QAE@XZ @ 26 NONAME ; QDeclarativeContextPrivate::QDeclarativeContextPrivate(void)
+	??0QDeclarativeContextPrivate@@QAE@XZ @ 26 NONAME ABSENT ; QDeclarativeContextPrivate::QDeclarativeContextPrivate(void)
 	??0QDeclarativeCurve@@QAE@PAVQObject@@@Z @ 27 NONAME ; QDeclarativeCurve::QDeclarativeCurve(class QObject *)
 	??0QDeclarativeCustomParserNode@@QAE@ABV0@@Z @ 28 NONAME ; QDeclarativeCustomParserNode::QDeclarativeCustomParserNode(class QDeclarativeCustomParserNode const &)
 	??0QDeclarativeCustomParserNode@@QAE@XZ @ 29 NONAME ; QDeclarativeCustomParserNode::QDeclarativeCustomParserNode(void)
 	??0QDeclarativeCustomParserProperty@@QAE@ABV0@@Z @ 30 NONAME ; QDeclarativeCustomParserProperty::QDeclarativeCustomParserProperty(class QDeclarativeCustomParserProperty const &)
 	??0QDeclarativeCustomParserProperty@@QAE@XZ @ 31 NONAME ; QDeclarativeCustomParserProperty::QDeclarativeCustomParserProperty(void)
-	??0QDeclarativeDateTimeFormatter@@QAE@PAVQObject@@@Z @ 32 NONAME ; QDeclarativeDateTimeFormatter::QDeclarativeDateTimeFormatter(class QObject *)
+	??0QDeclarativeDateTimeFormatter@@QAE@PAVQObject@@@Z @ 32 NONAME ABSENT ; QDeclarativeDateTimeFormatter::QDeclarativeDateTimeFormatter(class QObject *)
 	??0QDeclarativeDebugClient@@QAE@ABVQString@@PAVQDeclarativeDebugConnection@@@Z @ 33 NONAME ; QDeclarativeDebugClient::QDeclarativeDebugClient(class QString const &, class QDeclarativeDebugConnection *)
 	??0QDeclarativeDebugConnection@@QAE@PAVQObject@@@Z @ 34 NONAME ; QDeclarativeDebugConnection::QDeclarativeDebugConnection(class QObject *)
 	??0QDeclarativeDebugContextReference@@QAE@ABV0@@Z @ 35 NONAME ; QDeclarativeDebugContextReference::QDeclarativeDebugContextReference(class QDeclarativeDebugContextReference const &)
@@ -79,13 +79,13 @@ EXPORTS
 	??0QDeclarativeDomValueValueSource@@QAE@ABV0@@Z @ 78 NONAME ; QDeclarativeDomValueValueSource::QDeclarativeDomValueValueSource(class QDeclarativeDomValueValueSource const &)
 	??0QDeclarativeDomValueValueSource@@QAE@XZ @ 79 NONAME ; QDeclarativeDomValueValueSource::QDeclarativeDomValueValueSource(void)
 	??0QDeclarativeDrag@@QAE@PAVQObject@@@Z @ 80 NONAME ; QDeclarativeDrag::QDeclarativeDrag(class QObject *)
-	??0QDeclarativeEaseFollow@@QAE@PAVQObject@@@Z @ 81 NONAME ; QDeclarativeEaseFollow::QDeclarativeEaseFollow(class QObject *)
+	??0QDeclarativeEaseFollow@@QAE@PAVQObject@@@Z @ 81 NONAME ABSENT ; QDeclarativeEaseFollow::QDeclarativeEaseFollow(class QObject *)
 	??0QDeclarativeEngine@@QAE@PAVQObject@@@Z @ 82 NONAME ; QDeclarativeEngine::QDeclarativeEngine(class QObject *)
 	??0QDeclarativeEngineDebug@@QAE@PAVQDeclarativeDebugConnection@@PAVQObject@@@Z @ 83 NONAME ; QDeclarativeEngineDebug::QDeclarativeEngineDebug(class QDeclarativeDebugConnection *, class QObject *)
 	??0QDeclarativeError@@QAE@ABV0@@Z @ 84 NONAME ; QDeclarativeError::QDeclarativeError(class QDeclarativeError const &)
 	??0QDeclarativeError@@QAE@XZ @ 85 NONAME ; QDeclarativeError::QDeclarativeError(void)
-	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContext@@ABVQString@@PAVQObject@@AAVQDeclarativeExpressionPrivate@@@Z @ 86 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContext *, class QString const &, class QObject *, class QDeclarativeExpressionPrivate &)
-	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContext@@PAXPAVQDeclarativeRefCount@@PAVQObject@@ABVQString@@HAAVQDeclarativeExpressionPrivate@@@Z @ 87 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContext *, void *, class QDeclarativeRefCount *, class QObject *, class QString const &, int, class QDeclarativeExpressionPrivate &)
+	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContext@@ABVQString@@PAVQObject@@AAVQDeclarativeExpressionPrivate@@@Z @ 86 NONAME ABSENT ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContext *, class QString const &, class QObject *, class QDeclarativeExpressionPrivate &)
+	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContext@@PAXPAVQDeclarativeRefCount@@PAVQObject@@ABVQString@@HAAVQDeclarativeExpressionPrivate@@@Z @ 87 NONAME ABSENT ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContext *, void *, class QDeclarativeRefCount *, class QObject *, class QString const &, int, class QDeclarativeExpressionPrivate &)
 	??0QDeclarativeExpression@@QAE@PAVQDeclarativeContext@@ABVQString@@PAVQObject@@@Z @ 88 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContext *, class QString const &, class QObject *)
 	??0QDeclarativeExpression@@QAE@XZ @ 89 NONAME ; QDeclarativeExpression::QDeclarativeExpression(void)
 	??0QDeclarativeExtensionPlugin@@QAE@PAVQObject@@@Z @ 90 NONAME ; QDeclarativeExtensionPlugin::QDeclarativeExtensionPlugin(class QObject *)
@@ -119,7 +119,7 @@ EXPORTS
 	??0QDeclarativeListView@@QAE@PAVQDeclarativeItem@@@Z @ 118 NONAME ; QDeclarativeListView::QDeclarativeListView(class QDeclarativeItem *)
 	??0QDeclarativeLoader@@QAE@PAVQDeclarativeItem@@@Z @ 119 NONAME ; QDeclarativeLoader::QDeclarativeLoader(class QDeclarativeItem *)
 	??0QDeclarativeMouseArea@@QAE@PAVQDeclarativeItem@@@Z @ 120 NONAME ; QDeclarativeMouseArea::QDeclarativeMouseArea(class QDeclarativeItem *)
-	??0QDeclarativeNumberFormatter@@QAE@PAVQObject@@@Z @ 121 NONAME ; QDeclarativeNumberFormatter::QDeclarativeNumberFormatter(class QObject *)
+	??0QDeclarativeNumberFormatter@@QAE@PAVQObject@@@Z @ 121 NONAME ABSENT ; QDeclarativeNumberFormatter::QDeclarativeNumberFormatter(class QObject *)
 	??0QDeclarativeOpenMetaObject@@QAE@PAVQObject@@PAVQDeclarativeOpenMetaObjectType@@_N@Z @ 122 NONAME ; QDeclarativeOpenMetaObject::QDeclarativeOpenMetaObject(class QObject *, class QDeclarativeOpenMetaObjectType *, bool)
 	??0QDeclarativeOpenMetaObject@@QAE@PAVQObject@@_N@Z @ 123 NONAME ; QDeclarativeOpenMetaObject::QDeclarativeOpenMetaObject(class QObject *, bool)
 	??0QDeclarativeOpenMetaObjectType@@QAE@PBUQMetaObject@@PAVQDeclarativeEngine@@@Z @ 124 NONAME ; QDeclarativeOpenMetaObjectType::QDeclarativeOpenMetaObjectType(struct QMetaObject const *, class QDeclarativeEngine *)
@@ -127,11 +127,11 @@ EXPORTS
 	??0QDeclarativePaintedItem@@QAE@PAVQDeclarativeItem@@@Z @ 126 NONAME ; QDeclarativePaintedItem::QDeclarativePaintedItem(class QDeclarativeItem *)
 	??0QDeclarativeParentChange@@QAE@PAVQObject@@@Z @ 127 NONAME ; QDeclarativeParentChange::QDeclarativeParentChange(class QObject *)
 	??0QDeclarativeParserStatus@@QAE@XZ @ 128 NONAME ; QDeclarativeParserStatus::QDeclarativeParserStatus(void)
-	??0QDeclarativeParticleMotion@@QAE@PAVQObject@@@Z @ 129 NONAME ; QDeclarativeParticleMotion::QDeclarativeParticleMotion(class QObject *)
-	??0QDeclarativeParticleMotionGravity@@QAE@PAVQObject@@@Z @ 130 NONAME ; QDeclarativeParticleMotionGravity::QDeclarativeParticleMotionGravity(class QObject *)
-	??0QDeclarativeParticleMotionLinear@@QAE@PAVQObject@@@Z @ 131 NONAME ; QDeclarativeParticleMotionLinear::QDeclarativeParticleMotionLinear(class QObject *)
-	??0QDeclarativeParticleMotionWander@@QAE@XZ @ 132 NONAME ; QDeclarativeParticleMotionWander::QDeclarativeParticleMotionWander(void)
-	??0QDeclarativeParticles@@QAE@PAVQDeclarativeItem@@@Z @ 133 NONAME ; QDeclarativeParticles::QDeclarativeParticles(class QDeclarativeItem *)
+	??0QDeclarativeParticleMotion@@QAE@PAVQObject@@@Z @ 129 NONAME ABSENT ; QDeclarativeParticleMotion::QDeclarativeParticleMotion(class QObject *)
+	??0QDeclarativeParticleMotionGravity@@QAE@PAVQObject@@@Z @ 130 NONAME ABSENT ; QDeclarativeParticleMotionGravity::QDeclarativeParticleMotionGravity(class QObject *)
+	??0QDeclarativeParticleMotionLinear@@QAE@PAVQObject@@@Z @ 131 NONAME ABSENT ; QDeclarativeParticleMotionLinear::QDeclarativeParticleMotionLinear(class QObject *)
+	??0QDeclarativeParticleMotionWander@@QAE@XZ @ 132 NONAME ABSENT ; QDeclarativeParticleMotionWander::QDeclarativeParticleMotionWander(void)
+	??0QDeclarativeParticles@@QAE@PAVQDeclarativeItem@@@Z @ 133 NONAME ABSENT ; QDeclarativeParticles::QDeclarativeParticles(class QDeclarativeItem *)
 	??0QDeclarativePath@@QAE@PAVQObject@@@Z @ 134 NONAME ; QDeclarativePath::QDeclarativePath(class QObject *)
 	??0QDeclarativePathAttribute@@QAE@PAVQObject@@@Z @ 135 NONAME ; QDeclarativePathAttribute::QDeclarativePathAttribute(class QObject *)
 	??0QDeclarativePathCubic@@QAE@PAVQObject@@@Z @ 136 NONAME ; QDeclarativePathCubic::QDeclarativePathCubic(class QObject *)
@@ -141,7 +141,7 @@ EXPORTS
 	??0QDeclarativePathQuad@@QAE@PAVQObject@@@Z @ 140 NONAME ; QDeclarativePathQuad::QDeclarativePathQuad(class QObject *)
 	??0QDeclarativePathView@@QAE@PAVQDeclarativeItem@@@Z @ 141 NONAME ; QDeclarativePathView::QDeclarativePathView(class QDeclarativeItem *)
 	??0QDeclarativePen@@QAE@PAVQObject@@@Z @ 142 NONAME ; QDeclarativePen::QDeclarativePen(class QObject *)
-	??0QDeclarativePixmapReply@@AAE@PAVQDeclarativeImageReader@@ABVQUrl@@@Z @ 143 NONAME ; QDeclarativePixmapReply::QDeclarativePixmapReply(class QDeclarativeImageReader *, class QUrl const &)
+	??0QDeclarativePixmapReply@@AAE@PAVQDeclarativeImageReader@@ABVQUrl@@@Z @ 143 NONAME ABSENT ; QDeclarativePixmapReply::QDeclarativePixmapReply(class QDeclarativeImageReader *, class QUrl const &)
 	??0QDeclarativeProperty@@QAE@ABV0@@Z @ 144 NONAME ; QDeclarativeProperty::QDeclarativeProperty(class QDeclarativeProperty const &)
 	??0QDeclarativeProperty@@QAE@PAVQObject@@@Z @ 145 NONAME ; QDeclarativeProperty::QDeclarativeProperty(class QObject *)
 	??0QDeclarativeProperty@@QAE@PAVQObject@@ABVQString@@@Z @ 146 NONAME ; QDeclarativeProperty::QDeclarativeProperty(class QObject *, class QString const &)
@@ -185,8 +185,8 @@ EXPORTS
 	??0QDeclarativeVisualItemModel@@QAE@XZ @ 184 NONAME ; QDeclarativeVisualItemModel::QDeclarativeVisualItemModel(void)
 	??0QDeclarativeVisualModel@@IAE@AAVQObjectPrivate@@PAVQObject@@@Z @ 185 NONAME ; QDeclarativeVisualModel::QDeclarativeVisualModel(class QObjectPrivate &, class QObject *)
 	??0QDeclarativeVisualModel@@QAE@XZ @ 186 NONAME ; QDeclarativeVisualModel::QDeclarativeVisualModel(void)
-	??0QDeclarativeWebPage@@QAE@PAVQDeclarativeWebView@@@Z @ 187 NONAME ; QDeclarativeWebPage::QDeclarativeWebPage(class QDeclarativeWebView *)
-	??0QDeclarativeWebView@@QAE@PAVQDeclarativeItem@@@Z @ 188 NONAME ; QDeclarativeWebView::QDeclarativeWebView(class QDeclarativeItem *)
+	??0QDeclarativeWebPage@@QAE@PAVQDeclarativeWebView@@@Z @ 187 NONAME ABSENT ; QDeclarativeWebPage::QDeclarativeWebPage(class QDeclarativeWebView *)
+	??0QDeclarativeWebView@@QAE@PAVQDeclarativeItem@@@Z @ 188 NONAME ABSENT ; QDeclarativeWebView::QDeclarativeWebView(class QDeclarativeItem *)
 	??0QDeclarativeXmlListModel@@QAE@PAVQObject@@@Z @ 189 NONAME ; QDeclarativeXmlListModel::QDeclarativeXmlListModel(class QObject *)
 	??0QDeclarativeXmlListModelRole@@QAE@XZ @ 190 NONAME ; QDeclarativeXmlListModelRole::QDeclarativeXmlListModelRole(void)
 	??0QListModelInterface@@IAE@AAVQObjectPrivate@@PAVQObject@@@Z @ 191 NONAME ; QListModelInterface::QListModelInterface(class QObjectPrivate &, class QObject *)
@@ -217,12 +217,12 @@ EXPORTS
 	??1QDeclarativeComponent@@UAE@XZ @ 216 NONAME ; QDeclarativeComponent::~QDeclarativeComponent(void)
 	??1QDeclarativeConnections@@UAE@XZ @ 217 NONAME ; QDeclarativeConnections::~QDeclarativeConnections(void)
 	??1QDeclarativeContext@@UAE@XZ @ 218 NONAME ; QDeclarativeContext::~QDeclarativeContext(void)
-	??1QDeclarativeContextPrivate@@UAE@XZ @ 219 NONAME ; QDeclarativeContextPrivate::~QDeclarativeContextPrivate(void)
+	??1QDeclarativeContextPrivate@@UAE@XZ @ 219 NONAME ABSENT ; QDeclarativeContextPrivate::~QDeclarativeContextPrivate(void)
 	??1QDeclarativeCurve@@UAE@XZ @ 220 NONAME ; QDeclarativeCurve::~QDeclarativeCurve(void)
 	??1QDeclarativeCustomParser@@UAE@XZ @ 221 NONAME ; QDeclarativeCustomParser::~QDeclarativeCustomParser(void)
 	??1QDeclarativeCustomParserNode@@QAE@XZ @ 222 NONAME ; QDeclarativeCustomParserNode::~QDeclarativeCustomParserNode(void)
 	??1QDeclarativeCustomParserProperty@@QAE@XZ @ 223 NONAME ; QDeclarativeCustomParserProperty::~QDeclarativeCustomParserProperty(void)
-	??1QDeclarativeDateTimeFormatter@@UAE@XZ @ 224 NONAME ; QDeclarativeDateTimeFormatter::~QDeclarativeDateTimeFormatter(void)
+	??1QDeclarativeDateTimeFormatter@@UAE@XZ @ 224 NONAME ABSENT ; QDeclarativeDateTimeFormatter::~QDeclarativeDateTimeFormatter(void)
 	??1QDeclarativeDebugClient@@UAE@XZ @ 225 NONAME ; QDeclarativeDebugClient::~QDeclarativeDebugClient(void)
 	??1QDeclarativeDebugConnection@@UAE@XZ @ 226 NONAME ; QDeclarativeDebugConnection::~QDeclarativeDebugConnection(void)
 	??1QDeclarativeDebugContextReference@@QAE@XZ @ 227 NONAME ; QDeclarativeDebugContextReference::~QDeclarativeDebugContextReference(void)
@@ -253,7 +253,7 @@ EXPORTS
 	??1QDeclarativeDomValueValueInterceptor@@QAE@XZ @ 252 NONAME ; QDeclarativeDomValueValueInterceptor::~QDeclarativeDomValueValueInterceptor(void)
 	??1QDeclarativeDomValueValueSource@@QAE@XZ @ 253 NONAME ; QDeclarativeDomValueValueSource::~QDeclarativeDomValueValueSource(void)
 	??1QDeclarativeDrag@@UAE@XZ @ 254 NONAME ; QDeclarativeDrag::~QDeclarativeDrag(void)
-	??1QDeclarativeEaseFollow@@UAE@XZ @ 255 NONAME ; QDeclarativeEaseFollow::~QDeclarativeEaseFollow(void)
+	??1QDeclarativeEaseFollow@@UAE@XZ @ 255 NONAME ABSENT ; QDeclarativeEaseFollow::~QDeclarativeEaseFollow(void)
 	??1QDeclarativeEngine@@UAE@XZ @ 256 NONAME ; QDeclarativeEngine::~QDeclarativeEngine(void)
 	??1QDeclarativeEngineDebug@@UAE@XZ @ 257 NONAME ; QDeclarativeEngineDebug::~QDeclarativeEngineDebug(void)
 	??1QDeclarativeError@@QAE@XZ @ 258 NONAME ; QDeclarativeError::~QDeclarativeError(void)
@@ -284,17 +284,17 @@ EXPORTS
 	??1QDeclarativeLoader@@UAE@XZ @ 283 NONAME ; QDeclarativeLoader::~QDeclarativeLoader(void)
 	??1QDeclarativeMouseArea@@UAE@XZ @ 284 NONAME ; QDeclarativeMouseArea::~QDeclarativeMouseArea(void)
 	??1QDeclarativeNetworkAccessManagerFactory@@UAE@XZ @ 285 NONAME ; QDeclarativeNetworkAccessManagerFactory::~QDeclarativeNetworkAccessManagerFactory(void)
-	??1QDeclarativeNumberFormatter@@UAE@XZ @ 286 NONAME ; QDeclarativeNumberFormatter::~QDeclarativeNumberFormatter(void)
+	??1QDeclarativeNumberFormatter@@UAE@XZ @ 286 NONAME ABSENT ; QDeclarativeNumberFormatter::~QDeclarativeNumberFormatter(void)
 	??1QDeclarativeOpenMetaObject@@UAE@XZ @ 287 NONAME ; QDeclarativeOpenMetaObject::~QDeclarativeOpenMetaObject(void)
 	??1QDeclarativeOpenMetaObjectType@@UAE@XZ @ 288 NONAME ; QDeclarativeOpenMetaObjectType::~QDeclarativeOpenMetaObjectType(void)
 	??1QDeclarativePaintedItem@@UAE@XZ @ 289 NONAME ; QDeclarativePaintedItem::~QDeclarativePaintedItem(void)
 	??1QDeclarativeParentChange@@UAE@XZ @ 290 NONAME ; QDeclarativeParentChange::~QDeclarativeParentChange(void)
 	??1QDeclarativeParserStatus@@UAE@XZ @ 291 NONAME ; QDeclarativeParserStatus::~QDeclarativeParserStatus(void)
-	??1QDeclarativeParticleMotion@@UAE@XZ @ 292 NONAME ; QDeclarativeParticleMotion::~QDeclarativeParticleMotion(void)
-	??1QDeclarativeParticleMotionGravity@@UAE@XZ @ 293 NONAME ; QDeclarativeParticleMotionGravity::~QDeclarativeParticleMotionGravity(void)
-	??1QDeclarativeParticleMotionLinear@@UAE@XZ @ 294 NONAME ; QDeclarativeParticleMotionLinear::~QDeclarativeParticleMotionLinear(void)
-	??1QDeclarativeParticleMotionWander@@UAE@XZ @ 295 NONAME ; QDeclarativeParticleMotionWander::~QDeclarativeParticleMotionWander(void)
-	??1QDeclarativeParticles@@UAE@XZ @ 296 NONAME ; QDeclarativeParticles::~QDeclarativeParticles(void)
+	??1QDeclarativeParticleMotion@@UAE@XZ @ 292 NONAME ABSENT ; QDeclarativeParticleMotion::~QDeclarativeParticleMotion(void)
+	??1QDeclarativeParticleMotionGravity@@UAE@XZ @ 293 NONAME ABSENT ; QDeclarativeParticleMotionGravity::~QDeclarativeParticleMotionGravity(void)
+	??1QDeclarativeParticleMotionLinear@@UAE@XZ @ 294 NONAME ABSENT ; QDeclarativeParticleMotionLinear::~QDeclarativeParticleMotionLinear(void)
+	??1QDeclarativeParticleMotionWander@@UAE@XZ @ 295 NONAME ABSENT ; QDeclarativeParticleMotionWander::~QDeclarativeParticleMotionWander(void)
+	??1QDeclarativeParticles@@UAE@XZ @ 296 NONAME ABSENT ; QDeclarativeParticles::~QDeclarativeParticles(void)
 	??1QDeclarativePath@@UAE@XZ @ 297 NONAME ; QDeclarativePath::~QDeclarativePath(void)
 	??1QDeclarativePathAttribute@@UAE@XZ @ 298 NONAME ; QDeclarativePathAttribute::~QDeclarativePathAttribute(void)
 	??1QDeclarativePathCubic@@UAE@XZ @ 299 NONAME ; QDeclarativePathCubic::~QDeclarativePathCubic(void)
@@ -335,8 +335,8 @@ EXPORTS
 	??1QDeclarativeVisualDataModel@@UAE@XZ @ 334 NONAME ; QDeclarativeVisualDataModel::~QDeclarativeVisualDataModel(void)
 	??1QDeclarativeVisualItemModel@@UAE@XZ @ 335 NONAME ; QDeclarativeVisualItemModel::~QDeclarativeVisualItemModel(void)
 	??1QDeclarativeVisualModel@@UAE@XZ @ 336 NONAME ; QDeclarativeVisualModel::~QDeclarativeVisualModel(void)
-	??1QDeclarativeWebPage@@UAE@XZ @ 337 NONAME ; QDeclarativeWebPage::~QDeclarativeWebPage(void)
-	??1QDeclarativeWebView@@UAE@XZ @ 338 NONAME ; QDeclarativeWebView::~QDeclarativeWebView(void)
+	??1QDeclarativeWebPage@@UAE@XZ @ 337 NONAME ABSENT ; QDeclarativeWebPage::~QDeclarativeWebPage(void)
+	??1QDeclarativeWebView@@UAE@XZ @ 338 NONAME ABSENT ; QDeclarativeWebView::~QDeclarativeWebView(void)
 	??1QDeclarativeXmlListModel@@UAE@XZ @ 339 NONAME ; QDeclarativeXmlListModel::~QDeclarativeXmlListModel(void)
 	??1QDeclarativeXmlListModelRole@@UAE@XZ @ 340 NONAME ; QDeclarativeXmlListModelRole::~QDeclarativeXmlListModelRole(void)
 	??1QListModelInterface@@UAE@XZ @ 341 NONAME ; QListModelInterface::~QListModelInterface(void)
@@ -414,10 +414,10 @@ EXPORTS
 	??_EQDeclarativeComponent@@UAE@I@Z @ 413 NONAME ; QDeclarativeComponent::~QDeclarativeComponent(unsigned int)
 	??_EQDeclarativeConnections@@UAE@I@Z @ 414 NONAME ; QDeclarativeConnections::~QDeclarativeConnections(unsigned int)
 	??_EQDeclarativeContext@@UAE@I@Z @ 415 NONAME ; QDeclarativeContext::~QDeclarativeContext(unsigned int)
-	??_EQDeclarativeContextPrivate@@UAE@I@Z @ 416 NONAME ; QDeclarativeContextPrivate::~QDeclarativeContextPrivate(unsigned int)
+	??_EQDeclarativeContextPrivate@@UAE@I@Z @ 416 NONAME ABSENT ; QDeclarativeContextPrivate::~QDeclarativeContextPrivate(unsigned int)
 	??_EQDeclarativeCurve@@UAE@I@Z @ 417 NONAME ; QDeclarativeCurve::~QDeclarativeCurve(unsigned int)
 	??_EQDeclarativeCustomParser@@UAE@I@Z @ 418 NONAME ; QDeclarativeCustomParser::~QDeclarativeCustomParser(unsigned int)
-	??_EQDeclarativeDateTimeFormatter@@UAE@I@Z @ 419 NONAME ; QDeclarativeDateTimeFormatter::~QDeclarativeDateTimeFormatter(unsigned int)
+	??_EQDeclarativeDateTimeFormatter@@UAE@I@Z @ 419 NONAME ABSENT ; QDeclarativeDateTimeFormatter::~QDeclarativeDateTimeFormatter(unsigned int)
 	??_EQDeclarativeDebugClient@@UAE@I@Z @ 420 NONAME ; QDeclarativeDebugClient::~QDeclarativeDebugClient(unsigned int)
 	??_EQDeclarativeDebugConnection@@UAE@I@Z @ 421 NONAME ; QDeclarativeDebugConnection::~QDeclarativeDebugConnection(unsigned int)
 	??_EQDeclarativeDebugContextReference@@QAE@I@Z @ 422 NONAME ; QDeclarativeDebugContextReference::~QDeclarativeDebugContextReference(unsigned int)
@@ -435,7 +435,7 @@ EXPORTS
 	??_EQDeclarativeDebugWatch@@UAE@I@Z @ 434 NONAME ; QDeclarativeDebugWatch::~QDeclarativeDebugWatch(unsigned int)
 	??_EQDeclarativeDebuggerStatus@@UAE@I@Z @ 435 NONAME ; QDeclarativeDebuggerStatus::~QDeclarativeDebuggerStatus(unsigned int)
 	??_EQDeclarativeDrag@@UAE@I@Z @ 436 NONAME ; QDeclarativeDrag::~QDeclarativeDrag(unsigned int)
-	??_EQDeclarativeEaseFollow@@UAE@I@Z @ 437 NONAME ; QDeclarativeEaseFollow::~QDeclarativeEaseFollow(unsigned int)
+	??_EQDeclarativeEaseFollow@@UAE@I@Z @ 437 NONAME ABSENT ; QDeclarativeEaseFollow::~QDeclarativeEaseFollow(unsigned int)
 	??_EQDeclarativeEngine@@UAE@I@Z @ 438 NONAME ; QDeclarativeEngine::~QDeclarativeEngine(unsigned int)
 	??_EQDeclarativeEngineDebug@@UAE@I@Z @ 439 NONAME ; QDeclarativeEngineDebug::~QDeclarativeEngineDebug(unsigned int)
 	??_EQDeclarativeExpression@@UAE@I@Z @ 440 NONAME ; QDeclarativeExpression::~QDeclarativeExpression(unsigned int)
@@ -461,17 +461,17 @@ EXPORTS
 	??_EQDeclarativeLoader@@UAE@I@Z @ 460 NONAME ; QDeclarativeLoader::~QDeclarativeLoader(unsigned int)
 	??_EQDeclarativeMouseArea@@UAE@I@Z @ 461 NONAME ; QDeclarativeMouseArea::~QDeclarativeMouseArea(unsigned int)
 	??_EQDeclarativeNetworkAccessManagerFactory@@UAE@I@Z @ 462 NONAME ; QDeclarativeNetworkAccessManagerFactory::~QDeclarativeNetworkAccessManagerFactory(unsigned int)
-	??_EQDeclarativeNumberFormatter@@UAE@I@Z @ 463 NONAME ; QDeclarativeNumberFormatter::~QDeclarativeNumberFormatter(unsigned int)
+	??_EQDeclarativeNumberFormatter@@UAE@I@Z @ 463 NONAME ABSENT ; QDeclarativeNumberFormatter::~QDeclarativeNumberFormatter(unsigned int)
 	??_EQDeclarativeOpenMetaObject@@UAE@I@Z @ 464 NONAME ; QDeclarativeOpenMetaObject::~QDeclarativeOpenMetaObject(unsigned int)
 	??_EQDeclarativeOpenMetaObjectType@@UAE@I@Z @ 465 NONAME ; QDeclarativeOpenMetaObjectType::~QDeclarativeOpenMetaObjectType(unsigned int)
 	??_EQDeclarativePaintedItem@@UAE@I@Z @ 466 NONAME ; QDeclarativePaintedItem::~QDeclarativePaintedItem(unsigned int)
 	??_EQDeclarativeParentChange@@UAE@I@Z @ 467 NONAME ; QDeclarativeParentChange::~QDeclarativeParentChange(unsigned int)
 	??_EQDeclarativeParserStatus@@UAE@I@Z @ 468 NONAME ; QDeclarativeParserStatus::~QDeclarativeParserStatus(unsigned int)
-	??_EQDeclarativeParticleMotion@@UAE@I@Z @ 469 NONAME ; QDeclarativeParticleMotion::~QDeclarativeParticleMotion(unsigned int)
-	??_EQDeclarativeParticleMotionGravity@@UAE@I@Z @ 470 NONAME ; QDeclarativeParticleMotionGravity::~QDeclarativeParticleMotionGravity(unsigned int)
-	??_EQDeclarativeParticleMotionLinear@@UAE@I@Z @ 471 NONAME ; QDeclarativeParticleMotionLinear::~QDeclarativeParticleMotionLinear(unsigned int)
-	??_EQDeclarativeParticleMotionWander@@UAE@I@Z @ 472 NONAME ; QDeclarativeParticleMotionWander::~QDeclarativeParticleMotionWander(unsigned int)
-	??_EQDeclarativeParticles@@UAE@I@Z @ 473 NONAME ; QDeclarativeParticles::~QDeclarativeParticles(unsigned int)
+	??_EQDeclarativeParticleMotion@@UAE@I@Z @ 469 NONAME ABSENT ; QDeclarativeParticleMotion::~QDeclarativeParticleMotion(unsigned int)
+	??_EQDeclarativeParticleMotionGravity@@UAE@I@Z @ 470 NONAME ABSENT ; QDeclarativeParticleMotionGravity::~QDeclarativeParticleMotionGravity(unsigned int)
+	??_EQDeclarativeParticleMotionLinear@@UAE@I@Z @ 471 NONAME ABSENT ; QDeclarativeParticleMotionLinear::~QDeclarativeParticleMotionLinear(unsigned int)
+	??_EQDeclarativeParticleMotionWander@@UAE@I@Z @ 472 NONAME ABSENT ; QDeclarativeParticleMotionWander::~QDeclarativeParticleMotionWander(unsigned int)
+	??_EQDeclarativeParticles@@UAE@I@Z @ 473 NONAME ABSENT ; QDeclarativeParticles::~QDeclarativeParticles(unsigned int)
 	??_EQDeclarativePath@@UAE@I@Z @ 474 NONAME ; QDeclarativePath::~QDeclarativePath(unsigned int)
 	??_EQDeclarativePathAttribute@@UAE@I@Z @ 475 NONAME ; QDeclarativePathAttribute::~QDeclarativePathAttribute(unsigned int)
 	??_EQDeclarativePathCubic@@UAE@I@Z @ 476 NONAME ; QDeclarativePathCubic::~QDeclarativePathCubic(unsigned int)
@@ -507,8 +507,8 @@ EXPORTS
 	??_EQDeclarativeVisualDataModel@@UAE@I@Z @ 506 NONAME ; QDeclarativeVisualDataModel::~QDeclarativeVisualDataModel(unsigned int)
 	??_EQDeclarativeVisualItemModel@@UAE@I@Z @ 507 NONAME ; QDeclarativeVisualItemModel::~QDeclarativeVisualItemModel(unsigned int)
 	??_EQDeclarativeVisualModel@@UAE@I@Z @ 508 NONAME ; QDeclarativeVisualModel::~QDeclarativeVisualModel(unsigned int)
-	??_EQDeclarativeWebPage@@UAE@I@Z @ 509 NONAME ; QDeclarativeWebPage::~QDeclarativeWebPage(unsigned int)
-	??_EQDeclarativeWebView@@UAE@I@Z @ 510 NONAME ; QDeclarativeWebView::~QDeclarativeWebView(unsigned int)
+	??_EQDeclarativeWebPage@@UAE@I@Z @ 509 NONAME ABSENT ; QDeclarativeWebPage::~QDeclarativeWebPage(unsigned int)
+	??_EQDeclarativeWebView@@UAE@I@Z @ 510 NONAME ABSENT ; QDeclarativeWebView::~QDeclarativeWebView(unsigned int)
 	??_EQDeclarativeXmlListModel@@UAE@I@Z @ 511 NONAME ; QDeclarativeXmlListModel::~QDeclarativeXmlListModel(unsigned int)
 	??_EQDeclarativeXmlListModelRole@@UAE@I@Z @ 512 NONAME ; QDeclarativeXmlListModelRole::~QDeclarativeXmlListModelRole(unsigned int)
 	??_EQListModelInterface@@UAE@I@Z @ 513 NONAME ; QListModelInterface::~QListModelInterface(unsigned int)
@@ -528,8 +528,8 @@ EXPORTS
 	?_q_rowsInserted@QDeclarativeVisualDataModel@@AAEXABVQModelIndex@@HH@Z @ 527 NONAME ; void QDeclarativeVisualDataModel::_q_rowsInserted(class QModelIndex const &, int, int)
 	?_q_rowsMoved@QDeclarativeVisualDataModel@@AAEXABVQModelIndex@@HH0H@Z @ 528 NONAME ; void QDeclarativeVisualDataModel::_q_rowsMoved(class QModelIndex const &, int, int, class QModelIndex const &, int)
 	?_q_rowsRemoved@QDeclarativeVisualDataModel@@AAEXABVQModelIndex@@HH@Z @ 529 NONAME ; void QDeclarativeVisualDataModel::_q_rowsRemoved(class QModelIndex const &, int, int)
-	?acceleration@QDeclarativeParticleMotionGravity@@QBEMXZ @ 530 NONAME ; float QDeclarativeParticleMotionGravity::acceleration(void) const
-	?accelerationChanged@QDeclarativeParticleMotionGravity@@IAEXXZ @ 531 NONAME ; void QDeclarativeParticleMotionGravity::accelerationChanged(void)
+	?acceleration@QDeclarativeParticleMotionGravity@@QBEMXZ @ 530 NONAME ABSENT ; float QDeclarativeParticleMotionGravity::acceleration(void) const
+	?accelerationChanged@QDeclarativeParticleMotionGravity@@IAEXXZ @ 531 NONAME ABSENT ; void QDeclarativeParticleMotionGravity::accelerationChanged(void)
 	?acceptableInputChanged@QDeclarativeTextInput@@IAEXXZ @ 532 NONAME ; void QDeclarativeTextInput::acceptableInputChanged(void)
 	?accepted@QDeclarativeTextInput@@IAEXXZ @ 533 NONAME ; void QDeclarativeTextInput::accepted(void)
 	?acceptedButtons@QDeclarativeMouseArea@@QBE?AV?$QFlags@W4MouseButton@Qt@@@@XZ @ 534 NONAME ; class QFlags<enum Qt::MouseButton> QDeclarativeMouseArea::acceptedButtons(void) const
@@ -547,7 +547,7 @@ EXPORTS
 	?addClassInfo@QMetaObjectBuilder@@QAEHABVQByteArray@@0@Z @ 546 NONAME ; int QMetaObjectBuilder::addClassInfo(class QByteArray const &, class QByteArray const &)
 	?addConstructor@QMetaObjectBuilder@@QAE?AVQMetaMethodBuilder@@ABVQByteArray@@@Z @ 547 NONAME ; class QMetaMethodBuilder QMetaObjectBuilder::addConstructor(class QByteArray const &)
 	?addConstructor@QMetaObjectBuilder@@QAE?AVQMetaMethodBuilder@@ABVQMetaMethod@@@Z @ 548 NONAME ; class QMetaMethodBuilder QMetaObjectBuilder::addConstructor(class QMetaMethod const &)
-	?addDefaultObject@QDeclarativeContext@@QAEXPAVQObject@@@Z @ 549 NONAME ; void QDeclarativeContext::addDefaultObject(class QObject *)
+	?addDefaultObject@QDeclarativeContext@@QAEXPAVQObject@@@Z @ 549 NONAME ABSENT ; void QDeclarativeContext::addDefaultObject(class QObject *)
 	?addEnumerator@QMetaObjectBuilder@@QAE?AVQMetaEnumBuilder@@ABVQByteArray@@@Z @ 550 NONAME ; class QMetaEnumBuilder QMetaObjectBuilder::addEnumerator(class QByteArray const &)
 	?addEnumerator@QMetaObjectBuilder@@QAE?AVQMetaEnumBuilder@@ABVQMetaEnum@@@Z @ 551 NONAME ; class QMetaEnumBuilder QMetaObjectBuilder::addEnumerator(class QMetaEnum const &)
 	?addId@QDeclarativeCompiler@@AAEXABVQString@@PAVObject@QDeclarativeParser@@@Z @ 552 NONAME ; void QDeclarativeCompiler::addId(class QString const &, class QDeclarativeParser::Object *)
@@ -562,8 +562,8 @@ EXPORTS
 	?addProperty@QMetaObjectBuilder@@QAE?AVQMetaPropertyBuilder@@ABVQMetaProperty@@@Z @ 561 NONAME ; class QMetaPropertyBuilder QMetaObjectBuilder::addProperty(class QMetaProperty const &)
 	?addRef@QDeclarativePixmapReply@@AAEXXZ @ 562 NONAME ; void QDeclarativePixmapReply::addRef(void)
 	?addRelatedMetaObject@QMetaObjectBuilder@@QAEHABQ6AABUQMetaObject@@XZ@Z @ 563 NONAME ; int QMetaObjectBuilder::addRelatedMetaObject(struct QMetaObject const & (* const)(void) const &)
-	?addRole@QDeclarativeListModel@@ABEXABVQString@@@Z @ 564 NONAME ; void QDeclarativeListModel::addRole(class QString const &) const
-	?addScript@QDeclarativeContextPrivate@@QAEXABUScriptBlock@Object@QDeclarativeParser@@PAVQObject@@@Z @ 565 NONAME ; void QDeclarativeContextPrivate::addScript(struct QDeclarativeParser::Object::ScriptBlock const &, class QObject *)
+	?addRole@QDeclarativeListModel@@ABEXABVQString@@@Z @ 564 NONAME ABSENT ; void QDeclarativeListModel::addRole(class QString const &) const
+	?addScript@QDeclarativeContextPrivate@@QAEXABUScriptBlock@Object@QDeclarativeParser@@PAVQObject@@@Z @ 565 NONAME ABSENT ; void QDeclarativeContextPrivate::addScript(struct QDeclarativeParser::Object::ScriptBlock const &, class QObject *)
 	?addSignal@QMetaObjectBuilder@@QAE?AVQMetaMethodBuilder@@ABVQByteArray@@@Z @ 566 NONAME ; class QMetaMethodBuilder QMetaObjectBuilder::addSignal(class QByteArray const &)
 	?addSlot@QMetaObjectBuilder@@QAE?AVQMetaMethodBuilder@@ABVQByteArray@@@Z @ 567 NONAME ; class QMetaMethodBuilder QMetaObjectBuilder::addSlot(class QByteArray const &)
 	?addToPath@QDeclarativeCurve@@UAEXAAVQPainterPath@@@Z @ 568 NONAME ; void QDeclarativeCurve::addToPath(class QPainterPath &)
@@ -575,20 +575,20 @@ EXPORTS
 	?addWatch@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugWatch@@ABVQDeclarativeDebugContextReference@@ABVQString@@PAVQObject@@@Z @ 574 NONAME ; class QDeclarativeDebugWatch * QDeclarativeEngineDebug::addWatch(class QDeclarativeDebugContextReference const &, class QString const &, class QObject *)
 	?addWatch@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugWatch@@ABVQDeclarativeDebugFileReference@@PAVQObject@@@Z @ 575 NONAME ; class QDeclarativeDebugWatch * QDeclarativeEngineDebug::addWatch(class QDeclarativeDebugFileReference const &, class QObject *)
 	?addWatch@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugWatch@@ABVQDeclarativeDebugObjectReference@@PAVQObject@@@Z @ 576 NONAME ; class QDeclarativeDebugWatch * QDeclarativeEngineDebug::addWatch(class QDeclarativeDebugObjectReference const &, class QObject *)
-	?advance@QDeclarativeParticleMotion@@UAEXAAVQDeclarativeParticle@@H@Z @ 577 NONAME ; void QDeclarativeParticleMotion::advance(class QDeclarativeParticle &, int)
-	?advance@QDeclarativeParticleMotionGravity@@UAEXAAVQDeclarativeParticle@@H@Z @ 578 NONAME ; void QDeclarativeParticleMotionGravity::advance(class QDeclarativeParticle &, int)
-	?advance@QDeclarativeParticleMotionLinear@@UAEXAAVQDeclarativeParticle@@H@Z @ 579 NONAME ; void QDeclarativeParticleMotionLinear::advance(class QDeclarativeParticle &, int)
-	?advance@QDeclarativeParticleMotionWander@@UAEXAAVQDeclarativeParticle@@H@Z @ 580 NONAME ; void QDeclarativeParticleMotionWander::advance(class QDeclarativeParticle &, int)
-	?alert@QDeclarativeWebView@@IAEXABVQString@@@Z @ 581 NONAME ; void QDeclarativeWebView::alert(class QString const &)
+	?advance@QDeclarativeParticleMotion@@UAEXAAVQDeclarativeParticle@@H@Z @ 577 NONAME ABSENT ; void QDeclarativeParticleMotion::advance(class QDeclarativeParticle &, int)
+	?advance@QDeclarativeParticleMotionGravity@@UAEXAAVQDeclarativeParticle@@H@Z @ 578 NONAME ABSENT ; void QDeclarativeParticleMotionGravity::advance(class QDeclarativeParticle &, int)
+	?advance@QDeclarativeParticleMotionLinear@@UAEXAAVQDeclarativeParticle@@H@Z @ 579 NONAME ABSENT ; void QDeclarativeParticleMotionLinear::advance(class QDeclarativeParticle &, int)
+	?advance@QDeclarativeParticleMotionWander@@UAEXAAVQDeclarativeParticle@@H@Z @ 580 NONAME ABSENT ; void QDeclarativeParticleMotionWander::advance(class QDeclarativeParticle &, int)
+	?alert@QDeclarativeWebView@@IAEXABVQString@@@Z @ 581 NONAME ABSENT ; void QDeclarativeWebView::alert(class QString const &)
 	?alternateBase@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 582 NONAME ; class QColor QDeclarativeSystemPalette::alternateBase(void) const
 	?anchors@QDeclarativeItem@@QAEPAVQDeclarativeAnchors@@XZ @ 583 NONAME ; class QDeclarativeAnchors * QDeclarativeItem::anchors(void)
-	?angle@QDeclarativeParticles@@QBEMXZ @ 584 NONAME ; float QDeclarativeParticles::angle(void) const
-	?angleChanged@QDeclarativeParticles@@IAEXXZ @ 585 NONAME ; void QDeclarativeParticles::angleChanged(void)
-	?angleDeviation@QDeclarativeParticles@@QBEMXZ @ 586 NONAME ; float QDeclarativeParticles::angleDeviation(void) const
-	?angleDeviationChanged@QDeclarativeParticles@@IAEXXZ @ 587 NONAME ; void QDeclarativeParticles::angleDeviationChanged(void)
+	?angle@QDeclarativeParticles@@QBEMXZ @ 584 NONAME ABSENT ; float QDeclarativeParticles::angle(void) const
+	?angleChanged@QDeclarativeParticles@@IAEXXZ @ 585 NONAME ABSENT ; void QDeclarativeParticles::angleChanged(void)
+	?angleDeviation@QDeclarativeParticles@@QBEMXZ @ 586 NONAME ABSENT ; float QDeclarativeParticles::angleDeviation(void) const
+	?angleDeviationChanged@QDeclarativeParticles@@IAEXXZ @ 587 NONAME ABSENT ; void QDeclarativeParticles::angleDeviationChanged(void)
 	?animStopped@QDeclarativeListView@@AAEXXZ @ 588 NONAME ; void QDeclarativeListView::animStopped(void)
 	?animation@QDeclarativeBehavior@@QAEPAVQDeclarativeAbstractAnimation@@XZ @ 589 NONAME ; class QDeclarativeAbstractAnimation * QDeclarativeBehavior::animation(void)
-	?animations@QDeclarativeTransition@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeAbstractAnimation@@@@XZ @ 590 NONAME ; struct QDeclarativeListProperty<class QDeclarativeAbstractAnimation> QDeclarativeTransition::animations(void)
+	?animations@QDeclarativeTransition@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeAbstractAnimation@@@@XZ @ 590 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativeAbstractAnimation> QDeclarativeTransition::animations(void)
 	?append@QDeclarativeListModel@@QAEXABVQScriptValue@@@Z @ 591 NONAME ; void QDeclarativeListModel::append(class QScriptValue const &)
 	?append@QDeclarativeListReference@@QBE_NPAVQObject@@@Z @ 592 NONAME ; bool QDeclarativeListReference::append(class QObject *) const
 	?apply@QDeclarativeState@@QAEXPAVQDeclarativeStateGroup@@PAVQDeclarativeTransition@@PAV1@@Z @ 593 NONAME ; void QDeclarativeState::apply(class QDeclarativeStateGroup *, class QDeclarativeTransition *, class QDeclarativeState *)
@@ -607,29 +607,29 @@ EXPORTS
 	?availableInVersion@QDeclarativeType@@QBE_NHH@Z @ 606 NONAME ; bool QDeclarativeType::availableInVersion(int, int) const
 	?axis@QDeclarativeDrag@@QBE?AW4Axis@1@XZ @ 607 NONAME ; enum QDeclarativeDrag::Axis QDeclarativeDrag::axis(void) const
 	?axisChanged@QDeclarativeDrag@@IAEXXZ @ 608 NONAME ; void QDeclarativeDrag::axisChanged(void)
-	?back@QDeclarativeFlipable@@QAEPAVQDeclarativeItem@@XZ @ 609 NONAME ; class QDeclarativeItem * QDeclarativeFlipable::back(void)
-	?backAction@QDeclarativeWebView@@QBEPAVQAction@@XZ @ 610 NONAME ; class QAction * QDeclarativeWebView::backAction(void) const
+	?back@QDeclarativeFlipable@@QAEPAVQDeclarativeItem@@XZ @ 609 NONAME ABSENT ; class QDeclarativeItem * QDeclarativeFlipable::back(void)
+	?backAction@QDeclarativeWebView@@QBEPAVQAction@@XZ @ 610 NONAME ABSENT ; class QAction * QDeclarativeWebView::backAction(void) const
 	?base@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 611 NONAME ; class QColor QDeclarativeSystemPalette::base(void) const
 	?baseMetaObject@QDeclarativeType@@QBEPBUQMetaObject@@XZ @ 612 NONAME ; struct QMetaObject const * QDeclarativeType::baseMetaObject(void) const
 	?baseUrl@QDeclarativeContext@@QBE?AVQUrl@@XZ @ 613 NONAME ; class QUrl QDeclarativeContext::baseUrl(void) const
 	?baseUrl@QDeclarativeEngine@@QBE?AVQUrl@@XZ @ 614 NONAME ; class QUrl QDeclarativeEngine::baseUrl(void) const
-	?baseline@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 615 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::baseline(void) const
-	?baseline@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 616 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchors::baseline(void) const
-	?baseline@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 617 NONAME ; class QDeclarativeAnchorLine QDeclarativeItem::baseline(void) const
+	?baseline@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 615 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::baseline(void) const
+	?baseline@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 616 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchors::baseline(void) const
+	?baseline@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 617 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeItem::baseline(void) const
 	?baselineChanged@QDeclarativeAnchors@@IAEXXZ @ 618 NONAME ; void QDeclarativeAnchors::baselineChanged(void)
 	?baselineOffset@QDeclarativeAnchors@@QBEMXZ @ 619 NONAME ; float QDeclarativeAnchors::baselineOffset(void) const
 	?baselineOffset@QDeclarativeItem@@QBEMXZ @ 620 NONAME ; float QDeclarativeItem::baselineOffset(void) const
 	?baselineOffsetChanged@QDeclarativeAnchors@@IAEXXZ @ 621 NONAME ; void QDeclarativeAnchors::baselineOffsetChanged(void)
-	?baselineOffsetChanged@QDeclarativeItem@@IAEXXZ @ 622 NONAME ; void QDeclarativeItem::baselineOffsetChanged(void)
+	?baselineOffsetChanged@QDeclarativeItem@@IAEXXZ @ 622 NONAME ABSENT ; void QDeclarativeItem::baselineOffsetChanged(void)
 	?beginCreate@QDeclarativeComponent@@UAEPAVQObject@@PAVQDeclarativeContext@@@Z @ 623 NONAME ; class QObject * QDeclarativeComponent::beginCreate(class QDeclarativeContext *)
 	?binding@QDeclarativeDebugPropertyReference@@QBE?AVQString@@XZ @ 624 NONAME ; class QString QDeclarativeDebugPropertyReference::binding(void) const
 	?binding@QDeclarativeDomValueBinding@@QBE?AVQString@@XZ @ 625 NONAME ; class QString QDeclarativeDomValueBinding::binding(void) const
 	?border@QDeclarativeBorderImage@@QAEPAVQDeclarativeScaleGrid@@XZ @ 626 NONAME ; class QDeclarativeScaleGrid * QDeclarativeBorderImage::border(void)
 	?border@QDeclarativeRectangle@@QAEPAVQDeclarativePen@@XZ @ 627 NONAME ; class QDeclarativePen * QDeclarativeRectangle::border(void)
 	?borderChanged@QDeclarativeScaleGrid@@IAEXXZ @ 628 NONAME ; void QDeclarativeScaleGrid::borderChanged(void)
-	?bottom@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 629 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::bottom(void) const
-	?bottom@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 630 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchors::bottom(void) const
-	?bottom@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 631 NONAME ; class QDeclarativeAnchorLine QDeclarativeItem::bottom(void) const
+	?bottom@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 629 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::bottom(void) const
+	?bottom@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 630 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchors::bottom(void) const
+	?bottom@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 631 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeItem::bottom(void) const
 	?bottom@QDeclarativeScaleGrid@@QBEHXZ @ 632 NONAME ; int QDeclarativeScaleGrid::bottom(void) const
 	?bottomChanged@QDeclarativeAnchors@@IAEXXZ @ 633 NONAME ; void QDeclarativeAnchors::bottomChanged(void)
 	?bottomMargin@QDeclarativeAnchors@@QBEMXZ @ 634 NONAME ; float QDeclarativeAnchors::bottomMargin(void) const
@@ -655,7 +655,7 @@ EXPORTS
 	?buildSignal@QDeclarativeCompiler@@AAE_NPAVProperty@QDeclarativeParser@@PAVObject@3@ABUBindingContext@1@@Z @ 654 NONAME ; bool QDeclarativeCompiler::buildSignal(class QDeclarativeParser::Property *, class QDeclarativeParser::Object *, struct QDeclarativeCompiler::BindingContext const &)
 	?buildSubObject@QDeclarativeCompiler@@AAE_NPAVObject@QDeclarativeParser@@ABUBindingContext@1@@Z @ 655 NONAME ; bool QDeclarativeCompiler::buildSubObject(class QDeclarativeParser::Object *, struct QDeclarativeCompiler::BindingContext const &)
 	?buildValueTypeProperty@QDeclarativeCompiler@@AAE_NPAVQObject@@PAVObject@QDeclarativeParser@@1ABUBindingContext@1@@Z @ 656 NONAME ; bool QDeclarativeCompiler::buildValueTypeProperty(class QObject *, class QDeclarativeParser::Object *, class QDeclarativeParser::Object *, struct QDeclarativeCompiler::BindingContext const &)
-	?burst@QDeclarativeParticles@@QAEXHH@Z @ 657 NONAME ; void QDeclarativeParticles::burst(int, int)
+	?burst@QDeclarativeParticles@@QAEXHH@Z @ 657 NONAME ABSENT ; void QDeclarativeParticles::burst(int, int)
 	?button@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 658 NONAME ; class QColor QDeclarativeSystemPalette::button(void) const
 	?buttonText@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 659 NONAME ; class QColor QDeclarativeSystemPalette::buttonText(void) const
 	?cacheBuffer@QDeclarativeGridView@@QBEHXZ @ 660 NONAME ; int QDeclarativeGridView::cacheBuffer(void) const
@@ -678,21 +678,21 @@ EXPORTS
 	?changed@QDeclarativePath@@IAEXXZ @ 677 NONAME ; void QDeclarativePath::changed(void)
 	?changed@QDeclarativePathElement@@IAEXXZ @ 678 NONAME ; void QDeclarativePathElement::changed(void)
 	?changed@QDeclarativeViewSection@@IAEXXZ @ 679 NONAME ; void QDeclarativeViewSection::changed(void)
-	?changes@QDeclarativeState@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeStateOperation@@@@XZ @ 680 NONAME ; struct QDeclarativeListProperty<class QDeclarativeStateOperation> QDeclarativeState::changes(void)
+	?changes@QDeclarativeState@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeStateOperation@@@@XZ @ 680 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativeStateOperation> QDeclarativeState::changes(void)
 	?changesBindings@QDeclarativeAnchorChanges@@UAE_NXZ @ 681 NONAME ; bool QDeclarativeAnchorChanges::changesBindings(void)
 	?checkDynamicMeta@QDeclarativeCompiler@@AAE_NPAVObject@QDeclarativeParser@@@Z @ 682 NONAME ; bool QDeclarativeCompiler::checkDynamicMeta(class QDeclarativeParser::Object *)
-	?checkRoles@QDeclarativeListModel@@ABEXXZ @ 683 NONAME ; void QDeclarativeListModel::checkRoles(void) const
+	?checkRoles@QDeclarativeListModel@@ABEXXZ @ 683 NONAME ABSENT ; void QDeclarativeListModel::checkRoles(void) const
 	?children@QDeclarativeDebugObjectReference@@QBE?AV?$QList@VQDeclarativeDebugObjectReference@@@@XZ @ 684 NONAME ; class QList<class QDeclarativeDebugObjectReference> QDeclarativeDebugObjectReference::children(void) const
-	?children@QDeclarativeVisualItemModel@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeItem@@@@XZ @ 685 NONAME ; struct QDeclarativeListProperty<class QDeclarativeItem> QDeclarativeVisualItemModel::children(void)
+	?children@QDeclarativeVisualItemModel@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeItem@@@@XZ @ 685 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativeItem> QDeclarativeVisualItemModel::children(void)
 	?childrenChanged@QDeclarativeItem@@IAEXXZ @ 686 NONAME ; void QDeclarativeItem::childrenChanged(void)
 	?childrenChanged@QDeclarativeVisualItemModel@@IAEXXZ @ 687 NONAME ; void QDeclarativeVisualItemModel::childrenChanged(void)
 	?childrenRect@QDeclarativeItem@@QAE?AVQRectF@@XZ @ 688 NONAME ; class QRectF QDeclarativeItem::childrenRect(void)
-	?childrenRectChanged@QDeclarativeItem@@IAEXXZ @ 689 NONAME ; void QDeclarativeItem::childrenRectChanged(void)
-	?chooseFile@QDeclarativeWebPage@@MAE?AVQString@@PAVQWebFrame@@ABV2@@Z @ 690 NONAME ; class QString QDeclarativeWebPage::chooseFile(class QWebFrame *, class QString const &)
+	?childrenRectChanged@QDeclarativeItem@@IAEXXZ @ 689 NONAME ABSENT ; void QDeclarativeItem::childrenRectChanged(void)
+	?chooseFile@QDeclarativeWebPage@@MAE?AVQString@@PAVQWebFrame@@ABV2@@Z @ 690 NONAME ABSENT ; class QString QDeclarativeWebPage::chooseFile(class QWebFrame *, class QString const &)
 	?classBegin@QDeclarativeAnchors@@QAEXXZ @ 691 NONAME ; void QDeclarativeAnchors::classBegin(void)
-	?classBegin@QDeclarativeDateTimeFormatter@@UAEXXZ @ 692 NONAME ; void QDeclarativeDateTimeFormatter::classBegin(void)
+	?classBegin@QDeclarativeDateTimeFormatter@@UAEXXZ @ 692 NONAME ABSENT ; void QDeclarativeDateTimeFormatter::classBegin(void)
 	?classBegin@QDeclarativeItem@@MAEXXZ @ 693 NONAME ; void QDeclarativeItem::classBegin(void)
-	?classBegin@QDeclarativeNumberFormatter@@UAEXXZ @ 694 NONAME ; void QDeclarativeNumberFormatter::classBegin(void)
+	?classBegin@QDeclarativeNumberFormatter@@UAEXXZ @ 694 NONAME ABSENT ; void QDeclarativeNumberFormatter::classBegin(void)
 	?classBegin@QDeclarativeParserStatus@@UAEXXZ @ 695 NONAME ; void QDeclarativeParserStatus::classBegin(void)
 	?classBegin@QDeclarativeStateGroup@@UAEXXZ @ 696 NONAME ; void QDeclarativeStateGroup::classBegin(void)
 	?classBegin@QDeclarativeTimer@@MAEXXZ @ 697 NONAME ; void QDeclarativeTimer::classBegin(void)
@@ -708,16 +708,16 @@ EXPORTS
 	?clear@QDeclarativeRepeater@@AAEXXZ @ 707 NONAME ; void QDeclarativeRepeater::clear(void)
 	?clear@QPacket@@QAEXXZ @ 708 NONAME ; void QPacket::clear(void)
 	?clear@QPacketProtocol@@QAEXXZ @ 709 NONAME ; void QPacketProtocol::clear(void)
-	?clear@QPerformanceLog@@YAXXZ @ 710 NONAME ; void QPerformanceLog::clear(void)
+	?clear@QPerformanceLog@@YAXXZ @ 710 NONAME ABSENT ; void QPerformanceLog::clear(void)
 	?clearCache@QDeclarativePaintedItem@@IAEXXZ @ 711 NONAME ; void QDeclarativePaintedItem::clearCache(void)
 	?clearComponentCache@QDeclarativeEngine@@QAEXXZ @ 712 NONAME ; void QDeclarativeEngine::clearComponentCache(void)
 	?clearError@QDeclarativeExpression@@QAEXXZ @ 713 NONAME ; void QDeclarativeExpression::clearError(void)
 	?clearErrors@QDeclarativeCustomParser@@QAEXXZ @ 714 NONAME ; void QDeclarativeCustomParser::clearErrors(void)
-	?clearForwardBindings@QDeclarativeAnchorChanges@@UAEXXZ @ 715 NONAME ; void QDeclarativeAnchorChanges::clearForwardBindings(void)
-	?clearReverseBindings@QDeclarativeAnchorChanges@@UAEXXZ @ 716 NONAME ; void QDeclarativeAnchorChanges::clearReverseBindings(void)
+	?clearForwardBindings@QDeclarativeAnchorChanges@@UAEXXZ @ 715 NONAME ABSENT ; void QDeclarativeAnchorChanges::clearForwardBindings(void)
+	?clearReverseBindings@QDeclarativeAnchorChanges@@UAEXXZ @ 716 NONAME ABSENT ; void QDeclarativeAnchorChanges::clearReverseBindings(void)
 	?clicked@QDeclarativeMouseArea@@IAEXPAVQDeclarativeMouseEvent@@@Z @ 717 NONAME ; void QDeclarativeMouseArea::clicked(class QDeclarativeMouseEvent *)
 	?clip@QDeclarativeItem@@QBE_NXZ @ 718 NONAME ; bool QDeclarativeItem::clip(void) const
-	?clipChanged@QDeclarativeItem@@IAEXXZ @ 719 NONAME ; void QDeclarativeItem::clipChanged(void)
+	?clipChanged@QDeclarativeItem@@IAEXXZ @ 719 NONAME ABSENT ; void QDeclarativeItem::clipChanged(void)
 	?color@QDeclarativeGradientStop@@QBE?AVQColor@@XZ @ 720 NONAME ; class QColor QDeclarativeGradientStop::color(void) const
 	?color@QDeclarativePen@@QBE?AVQColor@@XZ @ 721 NONAME ; class QColor QDeclarativePen::color(void) const
 	?color@QDeclarativeRectangle@@QBE?AVQColor@@XZ @ 722 NONAME ; class QColor QDeclarativeRectangle::color(void) const
@@ -748,14 +748,14 @@ EXPORTS
 	?componentComplete@QDeclarativeBasePositioner@@MAEXXZ @ 747 NONAME ; void QDeclarativeBasePositioner::componentComplete(void)
 	?componentComplete@QDeclarativeBind@@MAEXXZ @ 748 NONAME ; void QDeclarativeBind::componentComplete(void)
 	?componentComplete@QDeclarativeConnections@@EAEXXZ @ 749 NONAME ; void QDeclarativeConnections::componentComplete(void)
-	?componentComplete@QDeclarativeDateTimeFormatter@@UAEXXZ @ 750 NONAME ; void QDeclarativeDateTimeFormatter::componentComplete(void)
+	?componentComplete@QDeclarativeDateTimeFormatter@@UAEXXZ @ 750 NONAME ABSENT ; void QDeclarativeDateTimeFormatter::componentComplete(void)
 	?componentComplete@QDeclarativeGridView@@MAEXXZ @ 751 NONAME ; void QDeclarativeGridView::componentComplete(void)
 	?componentComplete@QDeclarativeImageBase@@MAEXXZ @ 752 NONAME ; void QDeclarativeImageBase::componentComplete(void)
 	?componentComplete@QDeclarativeItem@@MAEXXZ @ 753 NONAME ; void QDeclarativeItem::componentComplete(void)
 	?componentComplete@QDeclarativeListView@@MAEXXZ @ 754 NONAME ; void QDeclarativeListView::componentComplete(void)
-	?componentComplete@QDeclarativeNumberFormatter@@UAEXXZ @ 755 NONAME ; void QDeclarativeNumberFormatter::componentComplete(void)
+	?componentComplete@QDeclarativeNumberFormatter@@UAEXXZ @ 755 NONAME ABSENT ; void QDeclarativeNumberFormatter::componentComplete(void)
 	?componentComplete@QDeclarativeParserStatus@@UAEXXZ @ 756 NONAME ; void QDeclarativeParserStatus::componentComplete(void)
-	?componentComplete@QDeclarativeParticles@@MAEXXZ @ 757 NONAME ; void QDeclarativeParticles::componentComplete(void)
+	?componentComplete@QDeclarativeParticles@@MAEXXZ @ 757 NONAME ABSENT ; void QDeclarativeParticles::componentComplete(void)
 	?componentComplete@QDeclarativePath@@MAEXXZ @ 758 NONAME ; void QDeclarativePath::componentComplete(void)
 	?componentComplete@QDeclarativePathView@@MAEXXZ @ 759 NONAME ; void QDeclarativePathView::componentComplete(void)
 	?componentComplete@QDeclarativeRepeater@@MAEXXZ @ 760 NONAME ; void QDeclarativeRepeater::componentComplete(void)
@@ -763,7 +763,7 @@ EXPORTS
 	?componentComplete@QDeclarativeText@@UAEXXZ @ 762 NONAME ; void QDeclarativeText::componentComplete(void)
 	?componentComplete@QDeclarativeTextEdit@@UAEXXZ @ 763 NONAME ; void QDeclarativeTextEdit::componentComplete(void)
 	?componentComplete@QDeclarativeTimer@@MAEXXZ @ 764 NONAME ; void QDeclarativeTimer::componentComplete(void)
-	?componentComplete@QDeclarativeWebView@@EAEXXZ @ 765 NONAME ; void QDeclarativeWebView::componentComplete(void)
+	?componentComplete@QDeclarativeWebView@@EAEXXZ @ 765 NONAME ABSENT ; void QDeclarativeWebView::componentComplete(void)
 	?componentComplete@QDeclarativeXmlListModel@@UAEXXZ @ 766 NONAME ; void QDeclarativeXmlListModel::componentComplete(void)
 	?componentRoot@QDeclarativeDomComponent@@QBE?AVQDeclarativeDomObject@@XZ @ 767 NONAME ; class QDeclarativeDomObject QDeclarativeDomComponent::componentRoot(void) const
 	?componentState@QDeclarativeCompiler@@AAE?AUComponentCompileState@1@PAVObject@QDeclarativeParser@@@Z @ 768 NONAME ; struct QDeclarativeCompiler::ComponentCompileState QDeclarativeCompiler::componentState(class QDeclarativeParser::Object *)
@@ -791,8 +791,8 @@ EXPORTS
 	?contextDebugId@QDeclarativeDebugObjectReference@@QBEHXZ @ 790 NONAME ; int QDeclarativeDebugObjectReference::contextDebugId(void) const
 	?contextForObject@QDeclarativeEngine@@SAPAVQDeclarativeContext@@PBVQObject@@@Z @ 791 NONAME ; class QDeclarativeContext * QDeclarativeEngine::contextForObject(class QObject const *)
 	?contextProperty@QDeclarativeContext@@QBE?AVQVariant@@ABVQString@@@Z @ 792 NONAME ; class QVariant QDeclarativeContext::contextProperty(class QString const &) const
-	?context_at@QDeclarativeContextPrivate@@SAPAVQObject@@PAU?$QDeclarativeListProperty@VQObject@@@@H@Z @ 793 NONAME ; class QObject * QDeclarativeContextPrivate::context_at(struct QDeclarativeListProperty<class QObject> *, int)
-	?context_count@QDeclarativeContextPrivate@@SAHPAU?$QDeclarativeListProperty@VQObject@@@@@Z @ 794 NONAME ; int QDeclarativeContextPrivate::context_count(struct QDeclarativeListProperty<class QObject> *)
+	?context_at@QDeclarativeContextPrivate@@SAPAVQObject@@PAU?$QDeclarativeListProperty@VQObject@@@@H@Z @ 793 NONAME ABSENT ; class QObject * QDeclarativeContextPrivate::context_at(struct QDeclarativeListProperty<class QObject> *, int)
+	?context_count@QDeclarativeContextPrivate@@SAHPAU?$QDeclarativeListProperty@VQObject@@@@@Z @ 794 NONAME ABSENT ; int QDeclarativeContextPrivate::context_count(struct QDeclarativeListProperty<class QObject> *)
 	?contexts@QDeclarativeDebugContextReference@@QBE?AV?$QList@VQDeclarativeDebugContextReference@@@@XZ @ 795 NONAME ; class QList<class QDeclarativeDebugContextReference> QDeclarativeDebugContextReference::contexts(void) const
 	?continueExecute@QDeclarativeView@@AAEXXZ @ 796 NONAME ; void QDeclarativeView::continueExecute(void)
 	?control1X@QDeclarativePathCubic@@QBEMXZ @ 797 NONAME ; float QDeclarativePathCubic::control1X(void) const
@@ -808,7 +808,7 @@ EXPORTS
 	?count@QDeclarativeListReference@@QBEHXZ @ 807 NONAME ; int QDeclarativeListReference::count(void) const
 	?count@QDeclarativeListView@@QBEHXZ @ 808 NONAME ; int QDeclarativeListView::count(void) const
 	?count@QDeclarativeOpenMetaObject@@QBEHXZ @ 809 NONAME ; int QDeclarativeOpenMetaObject::count(void) const
-	?count@QDeclarativeParticles@@QBEHXZ @ 810 NONAME ; int QDeclarativeParticles::count(void) const
+	?count@QDeclarativeParticles@@QBEHXZ @ 810 NONAME ABSENT ; int QDeclarativeParticles::count(void) const
 	?count@QDeclarativePathView@@QBEHXZ @ 811 NONAME ; int QDeclarativePathView::count(void) const
 	?count@QDeclarativePropertyMap@@QBEHXZ @ 812 NONAME ; int QDeclarativePropertyMap::count(void) const
 	?count@QDeclarativeRepeater@@QBEHXZ @ 813 NONAME ; int QDeclarativeRepeater::count(void) const
@@ -816,9 +816,9 @@ EXPORTS
 	?count@QDeclarativeVisualItemModel@@UBEHXZ @ 815 NONAME ; int QDeclarativeVisualItemModel::count(void) const
 	?count@QDeclarativeXmlListModel@@UBEHXZ @ 816 NONAME ; int QDeclarativeXmlListModel::count(void) const
 	?countChanged@QDeclarativeGridView@@IAEXXZ @ 817 NONAME ; void QDeclarativeGridView::countChanged(void)
-	?countChanged@QDeclarativeListModel@@IAEXH@Z @ 818 NONAME ; void QDeclarativeListModel::countChanged(int)
+	?countChanged@QDeclarativeListModel@@IAEXH@Z @ 818 NONAME ABSENT ; void QDeclarativeListModel::countChanged(int)
 	?countChanged@QDeclarativeListView@@IAEXXZ @ 819 NONAME ; void QDeclarativeListView::countChanged(void)
-	?countChanged@QDeclarativeParticles@@IAEXXZ @ 820 NONAME ; void QDeclarativeParticles::countChanged(void)
+	?countChanged@QDeclarativeParticles@@IAEXXZ @ 820 NONAME ABSENT ; void QDeclarativeParticles::countChanged(void)
 	?countChanged@QDeclarativeRepeater@@IAEXXZ @ 821 NONAME ; void QDeclarativeRepeater::countChanged(void)
 	?countChanged@QDeclarativeVisualModel@@IAEXXZ @ 822 NONAME ; void QDeclarativeVisualModel::countChanged(void)
 	?countChanged@QDeclarativeXmlListModel@@IAEXXZ @ 823 NONAME ; void QDeclarativeXmlListModel::countChanged(void)
@@ -826,14 +826,14 @@ EXPORTS
 	?create@QDeclarativeType@@QBEPAVQObject@@XZ @ 825 NONAME ; class QObject * QDeclarativeType::create(void) const
 	?createCursor@QDeclarativeTextInput@@AAEXXZ @ 826 NONAME ; void QDeclarativeTextInput::createCursor(void)
 	?createObject@QDeclarativeComponent@@QAE?AVQScriptValue@@XZ @ 827 NONAME ; class QScriptValue QDeclarativeComponent::createObject(void)
-	?createPlugin@QDeclarativeWebPage@@MAEPAVQObject@@ABVQString@@ABVQUrl@@ABVQStringList@@2@Z @ 828 NONAME ; class QObject * QDeclarativeWebPage::createPlugin(class QString const &, class QUrl const &, class QStringList const &, class QStringList const &)
+	?createPlugin@QDeclarativeWebPage@@MAEPAVQObject@@ABVQString@@ABVQUrl@@ABVQStringList@@2@Z @ 828 NONAME ABSENT ; class QObject * QDeclarativeWebPage::createPlugin(class QString const &, class QUrl const &, class QStringList const &, class QStringList const &)
 	?createPointCache@QDeclarativePath@@ABEXXZ @ 829 NONAME ; void QDeclarativePath::createPointCache(void) const
 	?createProperty@QDeclarativeOpenMetaObject@@MAEHPBD0@Z @ 830 NONAME ; int QDeclarativeOpenMetaObject::createProperty(char const *, char const *)
 	?createProperty@QDeclarativeOpenMetaObjectType@@QAEHABVQByteArray@@@Z @ 831 NONAME ; int QDeclarativeOpenMetaObjectType::createProperty(class QByteArray const &)
-	?createWindow@QDeclarativeWebPage@@MAEPAVQWebPage@@W4WebWindowType@2@@Z @ 832 NONAME ; class QWebPage * QDeclarativeWebPage::createWindow(enum QWebPage::WebWindowType)
-	?createWindow@QDeclarativeWebView@@IAEPAV1@W4WebWindowType@QWebPage@@@Z @ 833 NONAME ; class QDeclarativeWebView * QDeclarativeWebView::createWindow(enum QWebPage::WebWindowType)
-	?created@QDeclarativeParticleMotion@@UAEXAAVQDeclarativeParticle@@@Z @ 834 NONAME ; void QDeclarativeParticleMotion::created(class QDeclarativeParticle &)
-	?created@QDeclarativeParticleMotionWander@@UAEXAAVQDeclarativeParticle@@@Z @ 835 NONAME ; void QDeclarativeParticleMotionWander::created(class QDeclarativeParticle &)
+	?createWindow@QDeclarativeWebPage@@MAEPAVQWebPage@@W4WebWindowType@2@@Z @ 832 NONAME ABSENT ; class QWebPage * QDeclarativeWebPage::createWindow(enum QWebPage::WebWindowType)
+	?createWindow@QDeclarativeWebView@@IAEPAV1@W4WebWindowType@QWebPage@@@Z @ 833 NONAME ABSENT ; class QDeclarativeWebView * QDeclarativeWebView::createWindow(enum QWebPage::WebWindowType)
+	?created@QDeclarativeParticleMotion@@UAEXAAVQDeclarativeParticle@@@Z @ 834 NONAME ABSENT ; void QDeclarativeParticleMotion::created(class QDeclarativeParticle &)
+	?created@QDeclarativeParticleMotionWander@@UAEXAAVQDeclarativeParticle@@@Z @ 835 NONAME ABSENT ; void QDeclarativeParticleMotionWander::created(class QDeclarativeParticle &)
 	?createdItem@QDeclarativeGridView@@AAEXHPAVQDeclarativeItem@@@Z @ 836 NONAME ; void QDeclarativeGridView::createdItem(int, class QDeclarativeItem *)
 	?createdItem@QDeclarativeListView@@AAEXHPAVQDeclarativeItem@@@Z @ 837 NONAME ; void QDeclarativeListView::createdItem(int, class QDeclarativeItem *)
 	?createdItem@QDeclarativePathView@@AAEXHPAVQDeclarativeItem@@@Z @ 838 NONAME ; void QDeclarativePathView::createdItem(int, class QDeclarativeItem *)
@@ -888,14 +888,14 @@ EXPORTS
 	?d_func@QDeclarativeConnections@@ABEPBVQDeclarativeConnectionsPrivate@@XZ @ 887 NONAME ; class QDeclarativeConnectionsPrivate const * QDeclarativeConnections::d_func(void) const
 	?d_func@QDeclarativeContext@@AAEPAVQDeclarativeContextPrivate@@XZ @ 888 NONAME ; class QDeclarativeContextPrivate * QDeclarativeContext::d_func(void)
 	?d_func@QDeclarativeContext@@ABEPBVQDeclarativeContextPrivate@@XZ @ 889 NONAME ; class QDeclarativeContextPrivate const * QDeclarativeContext::d_func(void) const
-	?d_func@QDeclarativeDateTimeFormatter@@AAEPAVQDeclarativeDateTimeFormatterPrivate@@XZ @ 890 NONAME ; class QDeclarativeDateTimeFormatterPrivate * QDeclarativeDateTimeFormatter::d_func(void)
-	?d_func@QDeclarativeDateTimeFormatter@@ABEPBVQDeclarativeDateTimeFormatterPrivate@@XZ @ 891 NONAME ; class QDeclarativeDateTimeFormatterPrivate const * QDeclarativeDateTimeFormatter::d_func(void) const
+	?d_func@QDeclarativeDateTimeFormatter@@AAEPAVQDeclarativeDateTimeFormatterPrivate@@XZ @ 890 NONAME ABSENT ; class QDeclarativeDateTimeFormatterPrivate * QDeclarativeDateTimeFormatter::d_func(void)
+	?d_func@QDeclarativeDateTimeFormatter@@ABEPBVQDeclarativeDateTimeFormatterPrivate@@XZ @ 891 NONAME ABSENT ; class QDeclarativeDateTimeFormatterPrivate const * QDeclarativeDateTimeFormatter::d_func(void) const
 	?d_func@QDeclarativeDebugClient@@AAEPAVQDeclarativeDebugClientPrivate@@XZ @ 892 NONAME ; class QDeclarativeDebugClientPrivate * QDeclarativeDebugClient::d_func(void)
 	?d_func@QDeclarativeDebugClient@@ABEPBVQDeclarativeDebugClientPrivate@@XZ @ 893 NONAME ; class QDeclarativeDebugClientPrivate const * QDeclarativeDebugClient::d_func(void) const
 	?d_func@QDeclarativeDebugService@@AAEPAVQDeclarativeDebugServicePrivate@@XZ @ 894 NONAME ; class QDeclarativeDebugServicePrivate * QDeclarativeDebugService::d_func(void)
 	?d_func@QDeclarativeDebugService@@ABEPBVQDeclarativeDebugServicePrivate@@XZ @ 895 NONAME ; class QDeclarativeDebugServicePrivate const * QDeclarativeDebugService::d_func(void) const
-	?d_func@QDeclarativeEaseFollow@@AAEPAVQDeclarativeEaseFollowPrivate@@XZ @ 896 NONAME ; class QDeclarativeEaseFollowPrivate * QDeclarativeEaseFollow::d_func(void)
-	?d_func@QDeclarativeEaseFollow@@ABEPBVQDeclarativeEaseFollowPrivate@@XZ @ 897 NONAME ; class QDeclarativeEaseFollowPrivate const * QDeclarativeEaseFollow::d_func(void) const
+	?d_func@QDeclarativeEaseFollow@@AAEPAVQDeclarativeEaseFollowPrivate@@XZ @ 896 NONAME ABSENT ; class QDeclarativeEaseFollowPrivate * QDeclarativeEaseFollow::d_func(void)
+	?d_func@QDeclarativeEaseFollow@@ABEPBVQDeclarativeEaseFollowPrivate@@XZ @ 897 NONAME ABSENT ; class QDeclarativeEaseFollowPrivate const * QDeclarativeEaseFollow::d_func(void) const
 	?d_func@QDeclarativeEngine@@AAEPAVQDeclarativeEnginePrivate@@XZ @ 898 NONAME ; class QDeclarativeEnginePrivate * QDeclarativeEngine::d_func(void)
 	?d_func@QDeclarativeEngine@@ABEPBVQDeclarativeEnginePrivate@@XZ @ 899 NONAME ; class QDeclarativeEnginePrivate const * QDeclarativeEngine::d_func(void) const
 	?d_func@QDeclarativeEngineDebug@@AAEPAVQDeclarativeEngineDebugPrivate@@XZ @ 900 NONAME ; class QDeclarativeEngineDebugPrivate * QDeclarativeEngineDebug::d_func(void)
@@ -926,14 +926,14 @@ EXPORTS
 	?d_func@QDeclarativeLoader@@ABEPBVQDeclarativeLoaderPrivate@@XZ @ 925 NONAME ; class QDeclarativeLoaderPrivate const * QDeclarativeLoader::d_func(void) const
 	?d_func@QDeclarativeMouseArea@@AAEPAVQDeclarativeMouseAreaPrivate@@XZ @ 926 NONAME ; class QDeclarativeMouseAreaPrivate * QDeclarativeMouseArea::d_func(void)
 	?d_func@QDeclarativeMouseArea@@ABEPBVQDeclarativeMouseAreaPrivate@@XZ @ 927 NONAME ; class QDeclarativeMouseAreaPrivate const * QDeclarativeMouseArea::d_func(void) const
-	?d_func@QDeclarativeNumberFormatter@@AAEPAVQDeclarativeNumberFormatterPrivate@@XZ @ 928 NONAME ; class QDeclarativeNumberFormatterPrivate * QDeclarativeNumberFormatter::d_func(void)
-	?d_func@QDeclarativeNumberFormatter@@ABEPBVQDeclarativeNumberFormatterPrivate@@XZ @ 929 NONAME ; class QDeclarativeNumberFormatterPrivate const * QDeclarativeNumberFormatter::d_func(void) const
+	?d_func@QDeclarativeNumberFormatter@@AAEPAVQDeclarativeNumberFormatterPrivate@@XZ @ 928 NONAME ABSENT ; class QDeclarativeNumberFormatterPrivate * QDeclarativeNumberFormatter::d_func(void)
+	?d_func@QDeclarativeNumberFormatter@@ABEPBVQDeclarativeNumberFormatterPrivate@@XZ @ 929 NONAME ABSENT ; class QDeclarativeNumberFormatterPrivate const * QDeclarativeNumberFormatter::d_func(void) const
 	?d_func@QDeclarativePaintedItem@@AAEPAVQDeclarativePaintedItemPrivate@@XZ @ 930 NONAME ; class QDeclarativePaintedItemPrivate * QDeclarativePaintedItem::d_func(void)
 	?d_func@QDeclarativePaintedItem@@ABEPBVQDeclarativePaintedItemPrivate@@XZ @ 931 NONAME ; class QDeclarativePaintedItemPrivate const * QDeclarativePaintedItem::d_func(void) const
 	?d_func@QDeclarativeParentChange@@AAEPAVQDeclarativeParentChangePrivate@@XZ @ 932 NONAME ; class QDeclarativeParentChangePrivate * QDeclarativeParentChange::d_func(void)
 	?d_func@QDeclarativeParentChange@@ABEPBVQDeclarativeParentChangePrivate@@XZ @ 933 NONAME ; class QDeclarativeParentChangePrivate const * QDeclarativeParentChange::d_func(void) const
-	?d_func@QDeclarativeParticles@@AAEPAVQDeclarativeParticlesPrivate@@XZ @ 934 NONAME ; class QDeclarativeParticlesPrivate * QDeclarativeParticles::d_func(void)
-	?d_func@QDeclarativeParticles@@ABEPBVQDeclarativeParticlesPrivate@@XZ @ 935 NONAME ; class QDeclarativeParticlesPrivate const * QDeclarativeParticles::d_func(void) const
+	?d_func@QDeclarativeParticles@@AAEPAVQDeclarativeParticlesPrivate@@XZ @ 934 NONAME ABSENT ; class QDeclarativeParticlesPrivate * QDeclarativeParticles::d_func(void)
+	?d_func@QDeclarativeParticles@@ABEPBVQDeclarativeParticlesPrivate@@XZ @ 935 NONAME ABSENT ; class QDeclarativeParticlesPrivate const * QDeclarativeParticles::d_func(void) const
 	?d_func@QDeclarativePath@@AAEPAVQDeclarativePathPrivate@@XZ @ 936 NONAME ; class QDeclarativePathPrivate * QDeclarativePath::d_func(void)
 	?d_func@QDeclarativePath@@ABEPBVQDeclarativePathPrivate@@XZ @ 937 NONAME ; class QDeclarativePathPrivate const * QDeclarativePath::d_func(void) const
 	?d_func@QDeclarativePathView@@AAEPAVQDeclarativePathViewPrivate@@XZ @ 938 NONAME ; class QDeclarativePathViewPrivate * QDeclarativePathView::d_func(void)
@@ -972,8 +972,8 @@ EXPORTS
 	?d_func@QDeclarativeVisualDataModel@@ABEPBVQDeclarativeVisualDataModelPrivate@@XZ @ 971 NONAME ; class QDeclarativeVisualDataModelPrivate const * QDeclarativeVisualDataModel::d_func(void) const
 	?d_func@QDeclarativeVisualItemModel@@AAEPAVQDeclarativeVisualItemModelPrivate@@XZ @ 972 NONAME ; class QDeclarativeVisualItemModelPrivate * QDeclarativeVisualItemModel::d_func(void)
 	?d_func@QDeclarativeVisualItemModel@@ABEPBVQDeclarativeVisualItemModelPrivate@@XZ @ 973 NONAME ; class QDeclarativeVisualItemModelPrivate const * QDeclarativeVisualItemModel::d_func(void) const
-	?d_func@QDeclarativeWebView@@AAEPAVQDeclarativeWebViewPrivate@@XZ @ 974 NONAME ; class QDeclarativeWebViewPrivate * QDeclarativeWebView::d_func(void)
-	?d_func@QDeclarativeWebView@@ABEPBVQDeclarativeWebViewPrivate@@XZ @ 975 NONAME ; class QDeclarativeWebViewPrivate const * QDeclarativeWebView::d_func(void) const
+	?d_func@QDeclarativeWebView@@AAEPAVQDeclarativeWebViewPrivate@@XZ @ 974 NONAME ABSENT ; class QDeclarativeWebViewPrivate * QDeclarativeWebView::d_func(void)
+	?d_func@QDeclarativeWebView@@ABEPBVQDeclarativeWebViewPrivate@@XZ @ 975 NONAME ABSENT ; class QDeclarativeWebViewPrivate const * QDeclarativeWebView::d_func(void) const
 	?d_func@QDeclarativeXmlListModel@@AAEPAVQDeclarativeXmlListModelPrivate@@XZ @ 976 NONAME ; class QDeclarativeXmlListModelPrivate * QDeclarativeXmlListModel::d_func(void)
 	?d_func@QDeclarativeXmlListModel@@ABEPBVQDeclarativeXmlListModelPrivate@@XZ @ 977 NONAME ; class QDeclarativeXmlListModelPrivate const * QDeclarativeXmlListModel::d_func(void) const
 	?d_func@QMetaEnumBuilder@@ABEPAVQMetaEnumBuilderPrivate@@XZ @ 978 NONAME ; class QMetaEnumBuilderPrivate * QMetaEnumBuilder::d_func(void) const
@@ -981,19 +981,19 @@ EXPORTS
 	?d_func@QMetaPropertyBuilder@@ABEPAVQMetaPropertyBuilderPrivate@@XZ @ 980 NONAME ; class QMetaPropertyBuilderPrivate * QMetaPropertyBuilder::d_func(void) const
 	?damping@QDeclarativeSpringFollow@@QBEMXZ @ 981 NONAME ; float QDeclarativeSpringFollow::damping(void) const
 	?dark@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 982 NONAME ; class QColor QDeclarativeSystemPalette::dark(void) const
-	?data@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQObject@@@@XZ @ 983 NONAME ; struct QDeclarativeListProperty<class QObject> QDeclarativeItem::data(void)
+	?data@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQObject@@@@XZ @ 983 NONAME ABSENT ; struct QDeclarativeListProperty<class QObject> QDeclarativeItem::data(void)
 	?data@QDeclarativeListModel@@UBE?AV?$QHash@HVQVariant@@@@HABV?$QList@H@@@Z @ 984 NONAME ; class QHash<int, class QVariant> QDeclarativeListModel::data(int, class QList<int> const &) const
 	?data@QDeclarativeListModel@@UBE?AVQVariant@@HH@Z @ 985 NONAME ; class QVariant QDeclarativeListModel::data(int, int) const
 	?data@QDeclarativeXmlListModel@@UBE?AV?$QHash@HVQVariant@@@@HABV?$QList@H@@@Z @ 986 NONAME ; class QHash<int, class QVariant> QDeclarativeXmlListModel::data(int, class QList<int> const &) const
 	?data@QDeclarativeXmlListModel@@UBE?AVQVariant@@HH@Z @ 987 NONAME ; class QVariant QDeclarativeXmlListModel::data(int, int) const
-	?date@QDeclarativeDateTimeFormatter@@QBE?AVQDate@@XZ @ 988 NONAME ; class QDate QDeclarativeDateTimeFormatter::date(void) const
-	?dateFormat@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 989 NONAME ; class QString QDeclarativeDateTimeFormatter::dateFormat(void) const
+	?date@QDeclarativeDateTimeFormatter@@QBE?AVQDate@@XZ @ 988 NONAME ABSENT ; class QDate QDeclarativeDateTimeFormatter::date(void) const
+	?dateFormat@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 989 NONAME ABSENT ; class QString QDeclarativeDateTimeFormatter::dateFormat(void) const
 	?dateFromString@QDeclarativeStringConverters@@YA?AVQDate@@ABVQString@@PA_N@Z @ 990 NONAME ; class QDate QDeclarativeStringConverters::dateFromString(class QString const &, bool *)
-	?dateText@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 991 NONAME ; class QString QDeclarativeDateTimeFormatter::dateText(void) const
-	?dateTime@QDeclarativeDateTimeFormatter@@QBE?AVQDateTime@@XZ @ 992 NONAME ; class QDateTime QDeclarativeDateTimeFormatter::dateTime(void) const
-	?dateTimeFormat@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 993 NONAME ; class QString QDeclarativeDateTimeFormatter::dateTimeFormat(void) const
+	?dateText@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 991 NONAME ABSENT ; class QString QDeclarativeDateTimeFormatter::dateText(void) const
+	?dateTime@QDeclarativeDateTimeFormatter@@QBE?AVQDateTime@@XZ @ 992 NONAME ABSENT ; class QDateTime QDeclarativeDateTimeFormatter::dateTime(void) const
+	?dateTimeFormat@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 993 NONAME ABSENT ; class QString QDeclarativeDateTimeFormatter::dateTimeFormat(void) const
 	?dateTimeFromString@QDeclarativeStringConverters@@YA?AVQDateTime@@ABVQString@@PA_N@Z @ 994 NONAME ; class QDateTime QDeclarativeStringConverters::dateTimeFromString(class QString const &, bool *)
-	?dateTimeText@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 995 NONAME ; class QString QDeclarativeDateTimeFormatter::dateTimeText(void) const
+	?dateTimeText@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 995 NONAME ABSENT ; class QString QDeclarativeDateTimeFormatter::dateTimeText(void) const
 	?debugId@QDeclarativeDebugContextReference@@QBEHXZ @ 996 NONAME ; int QDeclarativeDebugContextReference::debugId(void) const
 	?debugId@QDeclarativeDebugEngineReference@@QBEHXZ @ 997 NONAME ; int QDeclarativeDebugEngineReference::debugId(void) const
 	?debugId@QDeclarativeDebugObjectReference@@QBEHXZ @ 998 NONAME ; int QDeclarativeDebugObjectReference::debugId(void) const
@@ -1015,11 +1015,11 @@ EXPORTS
 	?deleteFromBinding@QDeclarativeAction@@QAEXXZ @ 1014 NONAME ; void QDeclarativeAction::deleteFromBinding(void)
 	?description@QDeclarativeError@@QBE?AVQString@@XZ @ 1015 NONAME ; class QString QDeclarativeError::description(void) const
 	?deserialize@QMetaObjectBuilder@@QAEXAAVQDataStream@@ABV?$QMap@VQByteArray@@PB$$CBUQMetaObject@@@@@Z @ 1016 NONAME ; void QMetaObjectBuilder::deserialize(class QDataStream &, class QMap<class QByteArray, struct QMetaObject const *> const &)
-	?destroy@QDeclarativeParticleMotion@@UAEXAAVQDeclarativeParticle@@@Z @ 1017 NONAME ; void QDeclarativeParticleMotion::destroy(class QDeclarativeParticle &)
-	?destroy@QDeclarativeParticleMotionWander@@UAEXAAVQDeclarativeParticle@@@Z @ 1018 NONAME ; void QDeclarativeParticleMotionWander::destroy(class QDeclarativeParticle &)
+	?destroy@QDeclarativeParticleMotion@@UAEXAAVQDeclarativeParticle@@@Z @ 1017 NONAME ABSENT ; void QDeclarativeParticleMotion::destroy(class QDeclarativeParticle &)
+	?destroy@QDeclarativeParticleMotionWander@@UAEXAAVQDeclarativeParticle@@@Z @ 1018 NONAME ABSENT ; void QDeclarativeParticleMotionWander::destroy(class QDeclarativeParticle &)
 	?destroyRemoved@QDeclarativeGridView@@AAEXXZ @ 1019 NONAME ; void QDeclarativeGridView::destroyRemoved(void)
 	?destroyRemoved@QDeclarativeListView@@AAEXXZ @ 1020 NONAME ; void QDeclarativeListView::destroyRemoved(void)
-	?destroyed@QDeclarativeContextPrivate@@QAEXPAUContextGuard@1@@Z @ 1021 NONAME ; void QDeclarativeContextPrivate::destroyed(struct QDeclarativeContextPrivate::ContextGuard *)
+	?destroyed@QDeclarativeContextPrivate@@QAEXPAUContextGuard@1@@Z @ 1021 NONAME ABSENT ; void QDeclarativeContextPrivate::destroyed(struct QDeclarativeContextPrivate::ContextGuard *)
 	?destroyingItem@QDeclarativeGridView@@AAEXPAVQDeclarativeItem@@@Z @ 1022 NONAME ; void QDeclarativeGridView::destroyingItem(class QDeclarativeItem *)
 	?destroyingItem@QDeclarativeListView@@AAEXPAVQDeclarativeItem@@@Z @ 1023 NONAME ; void QDeclarativeListView::destroyingItem(class QDeclarativeItem *)
 	?destroyingItem@QDeclarativePathView@@AAEXPAVQDeclarativeItem@@@Z @ 1024 NONAME ; void QDeclarativePathView::destroyingItem(class QDeclarativeItem *)
@@ -1027,47 +1027,47 @@ EXPORTS
 	?destroyingPackage@QDeclarativeVisualDataModel@@IAEXPAVQDeclarativePackage@@@Z @ 1026 NONAME ; void QDeclarativeVisualDataModel::destroyingPackage(class QDeclarativePackage *)
 	?device@QPacketProtocol@@QAEPAVQIODevice@@XZ @ 1027 NONAME ; class QIODevice * QPacketProtocol::device(void)
 	?dirtyCache@QDeclarativePaintedItem@@IAEXABVQRect@@@Z @ 1028 NONAME ; void QDeclarativePaintedItem::dirtyCache(class QRect const &)
-	?displayData@QPerformanceLog@@YAXXZ @ 1029 NONAME ; void QPerformanceLog::displayData(void)
-	?doLoadFinished@QDeclarativeWebView@@AAEX_N@Z @ 1030 NONAME ; void QDeclarativeWebView::doLoadFinished(bool)
-	?doLoadProgress@QDeclarativeWebView@@AAEXH@Z @ 1031 NONAME ; void QDeclarativeWebView::doLoadProgress(int)
-	?doLoadStarted@QDeclarativeWebView@@AAEXXZ @ 1032 NONAME ; void QDeclarativeWebView::doLoadStarted(void)
-	?doPositioning@QDeclarativeColumn@@MAEXXZ @ 1033 NONAME ; void QDeclarativeColumn::doPositioning(void)
-	?doPositioning@QDeclarativeFlow@@MAEXXZ @ 1034 NONAME ; void QDeclarativeFlow::doPositioning(void)
-	?doPositioning@QDeclarativeGrid@@MAEXXZ @ 1035 NONAME ; void QDeclarativeGrid::doPositioning(void)
-	?doPositioning@QDeclarativeRow@@MAEXXZ @ 1036 NONAME ; void QDeclarativeRow::doPositioning(void)
+	?displayData@QPerformanceLog@@YAXXZ @ 1029 NONAME ABSENT ; void QPerformanceLog::displayData(void)
+	?doLoadFinished@QDeclarativeWebView@@AAEX_N@Z @ 1030 NONAME ABSENT ; void QDeclarativeWebView::doLoadFinished(bool)
+	?doLoadProgress@QDeclarativeWebView@@AAEXH@Z @ 1031 NONAME ABSENT ; void QDeclarativeWebView::doLoadProgress(int)
+	?doLoadStarted@QDeclarativeWebView@@AAEXXZ @ 1032 NONAME ABSENT ; void QDeclarativeWebView::doLoadStarted(void)
+	?doPositioning@QDeclarativeColumn@@MAEXXZ @ 1033 NONAME ABSENT ; void QDeclarativeColumn::doPositioning(void)
+	?doPositioning@QDeclarativeFlow@@MAEXXZ @ 1034 NONAME ABSENT ; void QDeclarativeFlow::doPositioning(void)
+	?doPositioning@QDeclarativeGrid@@MAEXXZ @ 1035 NONAME ABSENT ; void QDeclarativeGrid::doPositioning(void)
+	?doPositioning@QDeclarativeRow@@MAEXXZ @ 1036 NONAME ABSENT ; void QDeclarativeRow::doPositioning(void)
 	?doUpdate@QDeclarativeGradient@@AAEXXZ @ 1037 NONAME ; void QDeclarativeGradient::doUpdate(void)
 	?doUpdate@QDeclarativeRectangle@@AAEXXZ @ 1038 NONAME ; void QDeclarativeRectangle::doUpdate(void)
 	?doesPropertyExist@QDeclarativeCompiler@@AAE_NPAVProperty@QDeclarativeParser@@PAVObject@3@@Z @ 1039 NONAME ; bool QDeclarativeCompiler::doesPropertyExist(class QDeclarativeParser::Property *, class QDeclarativeParser::Object *)
-	?doubleClick@QDeclarativeWebView@@IAEXHH@Z @ 1040 NONAME ; void QDeclarativeWebView::doubleClick(int, int)
+	?doubleClick@QDeclarativeWebView@@IAEXHH@Z @ 1040 NONAME ABSENT ; void QDeclarativeWebView::doubleClick(int, int)
 	?doubleClicked@QDeclarativeMouseArea@@IAEXPAVQDeclarativeMouseEvent@@@Z @ 1041 NONAME ; void QDeclarativeMouseArea::doubleClicked(class QDeclarativeMouseEvent *)
 	?downloadProgress@QDeclarativePixmapReply@@IAEX_J0@Z @ 1042 NONAME ; void QDeclarativePixmapReply::downloadProgress(long long, long long)
 	?drag@QDeclarativeMouseArea@@QAEPAVQDeclarativeDrag@@XZ @ 1043 NONAME ; class QDeclarativeDrag * QDeclarativeMouseArea::drag(void)
 	?dragMargin@QDeclarativePathView@@QBEMXZ @ 1044 NONAME ; float QDeclarativePathView::dragMargin(void) const
 	?drawContents@QDeclarativeTextEdit@@MAEXPAVQPainter@@ABVQRect@@@Z @ 1045 NONAME ; void QDeclarativeTextEdit::drawContents(class QPainter *, class QRect const &)
 	?drawContents@QDeclarativeTextInput@@UAEXPAVQPainter@@ABVQRect@@@Z @ 1046 NONAME ; void QDeclarativeTextInput::drawContents(class QPainter *, class QRect const &)
-	?drawContents@QDeclarativeWebView@@MAEXPAVQPainter@@ABVQRect@@@Z @ 1047 NONAME ; void QDeclarativeWebView::drawContents(class QPainter *, class QRect const &)
+	?drawContents@QDeclarativeWebView@@MAEXPAVQPainter@@ABVQRect@@@Z @ 1047 NONAME ABSENT ; void QDeclarativeWebView::drawContents(class QPainter *, class QRect const &)
 	?drawRect@QDeclarativeRectangle@@AAEXAAVQPainter@@@Z @ 1048 NONAME ; void QDeclarativeRectangle::drawRect(class QPainter &)
 	?dumpStats@QDeclarativeCompiler@@AAEXXZ @ 1049 NONAME ; void QDeclarativeCompiler::dumpStats(void)
-	?duration@QDeclarativeEaseFollow@@QBEMXZ @ 1050 NONAME ; float QDeclarativeEaseFollow::duration(void) const
-	?durationChanged@QDeclarativeEaseFollow@@IAEXXZ @ 1051 NONAME ; void QDeclarativeEaseFollow::durationChanged(void)
+	?duration@QDeclarativeEaseFollow@@QBEMXZ @ 1050 NONAME ABSENT ; float QDeclarativeEaseFollow::duration(void) const
+	?durationChanged@QDeclarativeEaseFollow@@IAEXXZ @ 1051 NONAME ABSENT ; void QDeclarativeEaseFollow::durationChanged(void)
 	?dynamicProperties@QDeclarativeDomObject@@QBE?AV?$QList@VQDeclarativeDomDynamicProperty@@@@XZ @ 1052 NONAME ; class QList<class QDeclarativeDomDynamicProperty> QDeclarativeDomObject::dynamicProperties(void) const
 	?dynamicProperty@QDeclarativeDomObject@@QBE?AVQDeclarativeDomDynamicProperty@@ABVQByteArray@@@Z @ 1053 NONAME ; class QDeclarativeDomDynamicProperty QDeclarativeDomObject::dynamicProperty(class QByteArray const &) const
 	?echoMode@QDeclarativeTextInput@@QBE?AW4EchoMode@1@XZ @ 1054 NONAME ; enum QDeclarativeTextInput::EchoMode QDeclarativeTextInput::echoMode(void) const
 	?echoModeChanged@QDeclarativeTextInput@@IAEXW4EchoMode@1@@Z @ 1055 NONAME ; void QDeclarativeTextInput::echoModeChanged(enum QDeclarativeTextInput::EchoMode)
-	?elementAreaAt@QDeclarativeWebView@@QBE?AVQRect@@HHHH@Z @ 1056 NONAME ; class QRect QDeclarativeWebView::elementAreaAt(int, int, int, int) const
+	?elementAreaAt@QDeclarativeWebView@@QBE?AVQRect@@HHHH@Z @ 1056 NONAME ABSENT ; class QRect QDeclarativeWebView::elementAreaAt(int, int, int, int) const
 	?elideMode@QDeclarativeText@@QBE?AW4TextElideMode@1@XZ @ 1057 NONAME ; enum QDeclarativeText::TextElideMode QDeclarativeText::elideMode(void) const
 	?elideModeChanged@QDeclarativeText@@IAEXW4TextElideMode@1@@Z @ 1058 NONAME ; void QDeclarativeText::elideModeChanged(enum QDeclarativeText::TextElideMode)
-	?emissionRate@QDeclarativeParticles@@QBEHXZ @ 1059 NONAME ; int QDeclarativeParticles::emissionRate(void) const
-	?emissionRateChanged@QDeclarativeParticles@@IAEXXZ @ 1060 NONAME ; void QDeclarativeParticles::emissionRateChanged(void)
-	?emissionVariance@QDeclarativeParticles@@QBEMXZ @ 1061 NONAME ; float QDeclarativeParticles::emissionVariance(void) const
-	?emissionVarianceChanged@QDeclarativeParticles@@IAEXXZ @ 1062 NONAME ; void QDeclarativeParticles::emissionVarianceChanged(void)
-	?emittingChanged@QDeclarativeParticles@@IAEXXZ @ 1063 NONAME ; void QDeclarativeParticles::emittingChanged(void)
+	?emissionRate@QDeclarativeParticles@@QBEHXZ @ 1059 NONAME ABSENT ; int QDeclarativeParticles::emissionRate(void) const
+	?emissionRateChanged@QDeclarativeParticles@@IAEXXZ @ 1060 NONAME ABSENT ; void QDeclarativeParticles::emissionRateChanged(void)
+	?emissionVariance@QDeclarativeParticles@@QBEMXZ @ 1061 NONAME ABSENT ; float QDeclarativeParticles::emissionVariance(void) const
+	?emissionVarianceChanged@QDeclarativeParticles@@IAEXXZ @ 1062 NONAME ABSENT ; void QDeclarativeParticles::emissionVarianceChanged(void)
+	?emittingChanged@QDeclarativeParticles@@IAEXXZ @ 1063 NONAME ABSENT ; void QDeclarativeParticles::emittingChanged(void)
 	?enabled@QDeclarativeBehavior@@QBE_NXZ @ 1064 NONAME ; bool QDeclarativeBehavior::enabled(void) const
-	?enabled@QDeclarativeEaseFollow@@QBE_NXZ @ 1065 NONAME ; bool QDeclarativeEaseFollow::enabled(void) const
+	?enabled@QDeclarativeEaseFollow@@QBE_NXZ @ 1065 NONAME ABSENT ; bool QDeclarativeEaseFollow::enabled(void) const
 	?enabled@QDeclarativeSpringFollow@@QBE_NXZ @ 1066 NONAME ; bool QDeclarativeSpringFollow::enabled(void) const
 	?enabledChanged@QDeclarativeBehavior@@IAEXXZ @ 1067 NONAME ; void QDeclarativeBehavior::enabledChanged(void)
 	?enabledChanged@QDeclarativeDebugService@@MAEX_N@Z @ 1068 NONAME ; void QDeclarativeDebugService::enabledChanged(bool)
-	?enabledChanged@QDeclarativeEaseFollow@@IAEXXZ @ 1069 NONAME ; void QDeclarativeEaseFollow::enabledChanged(void)
+	?enabledChanged@QDeclarativeEaseFollow@@IAEXXZ @ 1069 NONAME ABSENT ; void QDeclarativeEaseFollow::enabledChanged(void)
 	?enabledChanged@QDeclarativeMouseArea@@IAEXXZ @ 1070 NONAME ; void QDeclarativeMouseArea::enabledChanged(void)
 	?endpoint@QDeclarativePath@@AAEXABVQString@@@Z @ 1071 NONAME ; void QDeclarativePath::endpoint(class QString const &)
 	?engine@QDeclarativeContext@@QBEPAVQDeclarativeEngine@@XZ @ 1072 NONAME ; class QDeclarativeEngine * QDeclarativeContext::engine(void) const
@@ -1090,7 +1090,7 @@ EXPORTS
 	?eval@QDeclarativeBind@@AAEXXZ @ 1089 NONAME ; void QDeclarativeBind::eval(void)
 	?evaluate@QDeclarativeVisualDataModel@@UAE?AVQVariant@@HABVQString@@PAVQObject@@@Z @ 1090 NONAME ; class QVariant QDeclarativeVisualDataModel::evaluate(int, class QString const &, class QObject *)
 	?evaluate@QDeclarativeVisualItemModel@@UAE?AVQVariant@@HABVQString@@PAVQObject@@@Z @ 1091 NONAME ; class QVariant QDeclarativeVisualItemModel::evaluate(int, class QString const &, class QObject *)
-	?evaluateJavaScript@QDeclarativeWebView@@QAE?AVQVariant@@ABVQString@@@Z @ 1092 NONAME ; class QVariant QDeclarativeWebView::evaluateJavaScript(class QString const &)
+	?evaluateJavaScript@QDeclarativeWebView@@QAE?AVQVariant@@ABVQString@@@Z @ 1092 NONAME ABSENT ; class QVariant QDeclarativeWebView::evaluateJavaScript(class QString const &)
 	?event@QDeclarativeItem@@MAE_NPAVQEvent@@@Z @ 1093 NONAME ; bool QDeclarativeItem::event(class QEvent *)
 	?event@QDeclarativePixmapReply@@MAE_NPAVQEvent@@@Z @ 1094 NONAME ; bool QDeclarativePixmapReply::event(class QEvent *)
 	?event@QDeclarativeSystemPalette@@EAE_NPAVQEvent@@@Z @ 1095 NONAME ; bool QDeclarativeSystemPalette::event(class QEvent *)
@@ -1103,16 +1103,16 @@ EXPORTS
 	?execute@QDeclarativeParentChange@@UAEXXZ @ 1102 NONAME ; void QDeclarativeParentChange::execute(void)
 	?execute@QDeclarativeStateChangeScript@@UAEXXZ @ 1103 NONAME ; void QDeclarativeStateChangeScript::execute(void)
 	?exited@QDeclarativeMouseArea@@IAEXXZ @ 1104 NONAME ; void QDeclarativeMouseArea::exited(void)
-	?expandToWebPage@QDeclarativeWebView@@AAEXXZ @ 1105 NONAME ; void QDeclarativeWebView::expandToWebPage(void)
+	?expandToWebPage@QDeclarativeWebView@@AAEXXZ @ 1105 NONAME ABSENT ; void QDeclarativeWebView::expandToWebPage(void)
 	?expression@QDeclarativeDebugExpressionQuery@@QBE?AVQString@@XZ @ 1106 NONAME ; class QString QDeclarativeDebugExpressionQuery::expression(void) const
 	?expression@QDeclarativeDebugObjectExpressionWatch@@QBE?AVQString@@XZ @ 1107 NONAME ; class QString QDeclarativeDebugObjectExpressionWatch::expression(void) const
 	?expression@QDeclarativeExpression@@QBE?AVQString@@XZ @ 1108 NONAME ; class QString QDeclarativeExpression::expression(void) const
 	?extends@QDeclarativeState@@QBE?AVQString@@XZ @ 1109 NONAME ; class QString QDeclarativeState::extends(void) const
-	?extraActions@QDeclarativeAnchorChanges@@UAE?AV?$QList@VQDeclarativeAction@@@@XZ @ 1110 NONAME ; class QList<class QDeclarativeAction> QDeclarativeAnchorChanges::extraActions(void)
-	?fadeInDuration@QDeclarativeParticles@@QBEHXZ @ 1111 NONAME ; int QDeclarativeParticles::fadeInDuration(void) const
-	?fadeInDurationChanged@QDeclarativeParticles@@IAEXXZ @ 1112 NONAME ; void QDeclarativeParticles::fadeInDurationChanged(void)
-	?fadeOutDuration@QDeclarativeParticles@@QBEHXZ @ 1113 NONAME ; int QDeclarativeParticles::fadeOutDuration(void) const
-	?fadeOutDurationChanged@QDeclarativeParticles@@IAEXXZ @ 1114 NONAME ; void QDeclarativeParticles::fadeOutDurationChanged(void)
+	?extraActions@QDeclarativeAnchorChanges@@UAE?AV?$QList@VQDeclarativeAction@@@@XZ @ 1110 NONAME ABSENT ; class QList<class QDeclarativeAction> QDeclarativeAnchorChanges::extraActions(void)
+	?fadeInDuration@QDeclarativeParticles@@QBEHXZ @ 1111 NONAME ABSENT ; int QDeclarativeParticles::fadeInDuration(void) const
+	?fadeInDurationChanged@QDeclarativeParticles@@IAEXXZ @ 1112 NONAME ABSENT ; void QDeclarativeParticles::fadeInDurationChanged(void)
+	?fadeOutDuration@QDeclarativeParticles@@QBEHXZ @ 1113 NONAME ABSENT ; int QDeclarativeParticles::fadeOutDuration(void) const
+	?fadeOutDurationChanged@QDeclarativeParticles@@IAEXXZ @ 1114 NONAME ABSENT ; void QDeclarativeParticles::fadeOutDurationChanged(void)
 	?fill@QDeclarativeAnchors@@QBEPAVQDeclarativeItem@@XZ @ 1115 NONAME ; class QDeclarativeItem * QDeclarativeAnchors::fill(void) const
 	?fillChanged@QDeclarativeAnchors@@IAEXXZ @ 1116 NONAME ; void QDeclarativeAnchors::fillChanged(void)
 	?fillColor@QDeclarativePaintedItem@@QBE?AVQColor@@XZ @ 1117 NONAME ; class QColor QDeclarativePaintedItem::fillColor(void) const
@@ -1131,17 +1131,17 @@ EXPORTS
 	?flickDirectionChanged@QDeclarativeFlickable@@IAEXXZ @ 1130 NONAME ; void QDeclarativeFlickable::flickDirectionChanged(void)
 	?flickEnded@QDeclarativeFlickable@@IAEXXZ @ 1131 NONAME ; void QDeclarativeFlickable::flickEnded(void)
 	?flickStarted@QDeclarativeFlickable@@IAEXXZ @ 1132 NONAME ; void QDeclarativeFlickable::flickStarted(void)
-	?flickableChildren@QDeclarativeFlickable@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeItem@@@@XZ @ 1133 NONAME ; struct QDeclarativeListProperty<class QDeclarativeItem> QDeclarativeFlickable::flickableChildren(void)
-	?flickableData@QDeclarativeFlickable@@QAE?AU?$QDeclarativeListProperty@VQObject@@@@XZ @ 1134 NONAME ; struct QDeclarativeListProperty<class QObject> QDeclarativeFlickable::flickableData(void)
+	?flickableChildren@QDeclarativeFlickable@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeItem@@@@XZ @ 1133 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativeItem> QDeclarativeFlickable::flickableChildren(void)
+	?flickableData@QDeclarativeFlickable@@QAE?AU?$QDeclarativeListProperty@VQObject@@@@XZ @ 1134 NONAME ABSENT ; struct QDeclarativeListProperty<class QObject> QDeclarativeFlickable::flickableData(void)
 	?flickingChanged@QDeclarativeFlickable@@IAEXXZ @ 1135 NONAME ; void QDeclarativeFlickable::flickingChanged(void)
 	?flow@QDeclarativeFlow@@QBE?AW4Flow@1@XZ @ 1136 NONAME ; enum QDeclarativeFlow::Flow QDeclarativeFlow::flow(void) const
 	?flow@QDeclarativeGridView@@QBE?AW4Flow@1@XZ @ 1137 NONAME ; enum QDeclarativeGridView::Flow QDeclarativeGridView::flow(void) const
 	?flowChanged@QDeclarativeFlow@@IAEXXZ @ 1138 NONAME ; void QDeclarativeFlow::flowChanged(void)
-	?focusChanged@QDeclarativeItem@@IAEXXZ @ 1139 NONAME ; void QDeclarativeItem::focusChanged(void)
-	?focusChanged@QDeclarativeItem@@MAEX_N@Z @ 1140 NONAME ; void QDeclarativeItem::focusChanged(bool)
-	?focusChanged@QDeclarativeTextEdit@@MAEX_N@Z @ 1141 NONAME ; void QDeclarativeTextEdit::focusChanged(bool)
-	?focusChanged@QDeclarativeTextInput@@MAEX_N@Z @ 1142 NONAME ; void QDeclarativeTextInput::focusChanged(bool)
-	?focusChanged@QDeclarativeWebView@@MAEX_N@Z @ 1143 NONAME ; void QDeclarativeWebView::focusChanged(bool)
+	?focusChanged@QDeclarativeItem@@IAEXXZ @ 1139 NONAME ABSENT ; void QDeclarativeItem::focusChanged(void)
+	?focusChanged@QDeclarativeItem@@MAEX_N@Z @ 1140 NONAME ABSENT ; void QDeclarativeItem::focusChanged(bool)
+	?focusChanged@QDeclarativeTextEdit@@MAEX_N@Z @ 1141 NONAME ABSENT ; void QDeclarativeTextEdit::focusChanged(bool)
+	?focusChanged@QDeclarativeTextInput@@MAEX_N@Z @ 1142 NONAME ABSENT ; void QDeclarativeTextInput::focusChanged(bool)
+	?focusChanged@QDeclarativeWebView@@MAEX_N@Z @ 1143 NONAME ABSENT ; void QDeclarativeWebView::focusChanged(bool)
 	?focusOnPress@QDeclarativeTextEdit@@QBE_NXZ @ 1144 NONAME ; bool QDeclarativeTextEdit::focusOnPress(void) const
 	?focusOnPress@QDeclarativeTextInput@@QBE_NXZ @ 1145 NONAME ; bool QDeclarativeTextInput::focusOnPress(void) const
 	?focusOnPressChanged@QDeclarativeTextEdit@@IAEX_N@Z @ 1146 NONAME ; void QDeclarativeTextEdit::focusOnPressChanged(bool)
@@ -1153,14 +1153,14 @@ EXPORTS
 	?fontChanged@QDeclarativeTextEdit@@IAEXABVQFont@@@Z @ 1152 NONAME ; void QDeclarativeTextEdit::fontChanged(class QFont const &)
 	?fontChanged@QDeclarativeTextInput@@IAEXABVQFont@@@Z @ 1153 NONAME ; void QDeclarativeTextInput::fontChanged(class QFont const &)
 	?footer@QDeclarativeListView@@QBEPAVQDeclarativeComponent@@XZ @ 1154 NONAME ; class QDeclarativeComponent * QDeclarativeListView::footer(void) const
-	?format@QDeclarativeNumberFormatter@@QBE?AVQString@@XZ @ 1155 NONAME ; class QString QDeclarativeNumberFormatter::format(void) const
-	?forwardAction@QDeclarativeWebView@@QBEPAVQAction@@XZ @ 1156 NONAME ; class QAction * QDeclarativeWebView::forwardAction(void) const
+	?format@QDeclarativeNumberFormatter@@QBE?AVQString@@XZ @ 1155 NONAME ABSENT ; class QString QDeclarativeNumberFormatter::format(void) const
+	?forwardAction@QDeclarativeWebView@@QBEPAVQAction@@XZ @ 1156 NONAME ABSENT ; class QAction * QDeclarativeWebView::forwardAction(void) const
 	?frameChanged@QDeclarativeAnimatedImage@@IAEXXZ @ 1157 NONAME ; void QDeclarativeAnimatedImage::frameChanged(void)
 	?frameCount@QDeclarativeAnimatedImage@@QBEHXZ @ 1158 NONAME ; int QDeclarativeAnimatedImage::frameCount(void) const
 	?fromRelocatableData@QMetaObjectBuilder@@SAXPAUQMetaObject@@PBU2@ABVQByteArray@@@Z @ 1159 NONAME ; void QMetaObjectBuilder::fromRelocatableData(struct QMetaObject *, struct QMetaObject const *, class QByteArray const &)
 	?fromState@QDeclarativeTransition@@QBE?AVQString@@XZ @ 1160 NONAME ; class QString QDeclarativeTransition::fromState(void) const
-	?front@QDeclarativeFlipable@@QAEPAVQDeclarativeItem@@XZ @ 1161 NONAME ; class QDeclarativeItem * QDeclarativeFlipable::front(void)
-	?fxChildren@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeItem@@@@XZ @ 1162 NONAME ; struct QDeclarativeListProperty<class QDeclarativeItem> QDeclarativeItem::fxChildren(void)
+	?front@QDeclarativeFlipable@@QAEPAVQDeclarativeItem@@XZ @ 1161 NONAME ABSENT ; class QDeclarativeItem * QDeclarativeFlipable::front(void)
+	?fxChildren@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeItem@@@@XZ @ 1162 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativeItem> QDeclarativeItem::fxChildren(void)
 	?genBindingAssignment@QDeclarativeCompiler@@AAEXPAVValue@QDeclarativeParser@@PAVProperty@3@PAVObject@3@1@Z @ 1163 NONAME ; void QDeclarativeCompiler::genBindingAssignment(class QDeclarativeParser::Value *, class QDeclarativeParser::Property *, class QDeclarativeParser::Object *, class QDeclarativeParser::Property *)
 	?genComponent@QDeclarativeCompiler@@AAEXPAVObject@QDeclarativeParser@@@Z @ 1164 NONAME ; void QDeclarativeCompiler::genComponent(class QDeclarativeParser::Object *)
 	?genContextCache@QDeclarativeCompiler@@AAEHXZ @ 1165 NONAME ; int QDeclarativeCompiler::genContextCache(void)
@@ -1180,11 +1180,11 @@ EXPORTS
 	?geometryChanged@QDeclarativeText@@MAEXABVQRectF@@0@Z @ 1179 NONAME ; void QDeclarativeText::geometryChanged(class QRectF const &, class QRectF const &)
 	?geometryChanged@QDeclarativeTextEdit@@MAEXABVQRectF@@0@Z @ 1180 NONAME ; void QDeclarativeTextEdit::geometryChanged(class QRectF const &, class QRectF const &)
 	?geometryChanged@QDeclarativeTextInput@@MAEXABVQRectF@@0@Z @ 1181 NONAME ; void QDeclarativeTextInput::geometryChanged(class QRectF const &, class QRectF const &)
-	?geometryChanged@QDeclarativeWebView@@MAEXABVQRectF@@0@Z @ 1182 NONAME ; void QDeclarativeWebView::geometryChanged(class QRectF const &, class QRectF const &)
-	?get@QDeclarativeContextPrivate@@SAPAV1@PAVQDeclarativeContext@@@Z @ 1183 NONAME ; class QDeclarativeContextPrivate * QDeclarativeContextPrivate::get(class QDeclarativeContext *)
-	?get@QDeclarativeContextPrivate@@SAPAVQDeclarativeContext@@PAV1@@Z @ 1184 NONAME ; class QDeclarativeContext * QDeclarativeContextPrivate::get(class QDeclarativeContextPrivate *)
+	?geometryChanged@QDeclarativeWebView@@MAEXABVQRectF@@0@Z @ 1182 NONAME ABSENT ; void QDeclarativeWebView::geometryChanged(class QRectF const &, class QRectF const &)
+	?get@QDeclarativeContextPrivate@@SAPAV1@PAVQDeclarativeContext@@@Z @ 1183 NONAME ABSENT ; class QDeclarativeContextPrivate * QDeclarativeContextPrivate::get(class QDeclarativeContext *)
+	?get@QDeclarativeContextPrivate@@SAPAVQDeclarativeContext@@PAV1@@Z @ 1184 NONAME ABSENT ; class QDeclarativeContext * QDeclarativeContextPrivate::get(class QDeclarativeContextPrivate *)
 	?get@QDeclarativeListModel@@QBE?AVQScriptValue@@H@Z @ 1185 NONAME ; class QScriptValue QDeclarativeListModel::get(int) const
-	?get@QDeclarativePixmapCache@@SA?AW4Status@QDeclarativePixmapReply@@ABVQUrl@@PAVQPixmap@@_N@Z @ 1186 NONAME ; enum QDeclarativePixmapReply::Status QDeclarativePixmapCache::get(class QUrl const &, class QPixmap *, bool)
+	?get@QDeclarativePixmapCache@@SA?AW4Status@QDeclarativePixmapReply@@ABVQUrl@@PAVQPixmap@@_N@Z @ 1186 NONAME ABSENT ; enum QDeclarativePixmapReply::Status QDeclarativePixmapCache::get(class QUrl const &, class QPixmap *, bool)
 	?getStaticMetaObject@QDeclarativeAnchorChanges@@SAABUQMetaObject@@XZ @ 1187 NONAME ; struct QMetaObject const & QDeclarativeAnchorChanges::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeAnchors@@SAABUQMetaObject@@XZ @ 1188 NONAME ; struct QMetaObject const & QDeclarativeAnchors::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeAnimatedImage@@SAABUQMetaObject@@XZ @ 1189 NONAME ; struct QMetaObject const & QDeclarativeAnimatedImage::getStaticMetaObject(void)
@@ -1197,7 +1197,7 @@ EXPORTS
 	?getStaticMetaObject@QDeclarativeConnections@@SAABUQMetaObject@@XZ @ 1196 NONAME ; struct QMetaObject const & QDeclarativeConnections::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeContext@@SAABUQMetaObject@@XZ @ 1197 NONAME ; struct QMetaObject const & QDeclarativeContext::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeCurve@@SAABUQMetaObject@@XZ @ 1198 NONAME ; struct QMetaObject const & QDeclarativeCurve::getStaticMetaObject(void)
-	?getStaticMetaObject@QDeclarativeDateTimeFormatter@@SAABUQMetaObject@@XZ @ 1199 NONAME ; struct QMetaObject const & QDeclarativeDateTimeFormatter::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeDateTimeFormatter@@SAABUQMetaObject@@XZ @ 1199 NONAME ABSENT ; struct QMetaObject const & QDeclarativeDateTimeFormatter::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeDebugClient@@SAABUQMetaObject@@XZ @ 1200 NONAME ; struct QMetaObject const & QDeclarativeDebugClient::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeDebugConnection@@SAABUQMetaObject@@XZ @ 1201 NONAME ; struct QMetaObject const & QDeclarativeDebugConnection::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeDebugEnginesQuery@@SAABUQMetaObject@@XZ @ 1202 NONAME ; struct QMetaObject const & QDeclarativeDebugEnginesQuery::getStaticMetaObject(void)
@@ -1210,7 +1210,7 @@ EXPORTS
 	?getStaticMetaObject@QDeclarativeDebugService@@SAABUQMetaObject@@XZ @ 1209 NONAME ; struct QMetaObject const & QDeclarativeDebugService::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeDebugWatch@@SAABUQMetaObject@@XZ @ 1210 NONAME ; struct QMetaObject const & QDeclarativeDebugWatch::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeDrag@@SAABUQMetaObject@@XZ @ 1211 NONAME ; struct QMetaObject const & QDeclarativeDrag::getStaticMetaObject(void)
-	?getStaticMetaObject@QDeclarativeEaseFollow@@SAABUQMetaObject@@XZ @ 1212 NONAME ; struct QMetaObject const & QDeclarativeEaseFollow::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeEaseFollow@@SAABUQMetaObject@@XZ @ 1212 NONAME ABSENT ; struct QMetaObject const & QDeclarativeEaseFollow::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeEngine@@SAABUQMetaObject@@XZ @ 1213 NONAME ; struct QMetaObject const & QDeclarativeEngine::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeEngineDebug@@SAABUQMetaObject@@XZ @ 1214 NONAME ; struct QMetaObject const & QDeclarativeEngineDebug::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeExpression@@SAABUQMetaObject@@XZ @ 1215 NONAME ; struct QMetaObject const & QDeclarativeExpression::getStaticMetaObject(void)
@@ -1233,14 +1233,14 @@ EXPORTS
 	?getStaticMetaObject@QDeclarativeListView@@SAABUQMetaObject@@XZ @ 1232 NONAME ; struct QMetaObject const & QDeclarativeListView::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeLoader@@SAABUQMetaObject@@XZ @ 1233 NONAME ; struct QMetaObject const & QDeclarativeLoader::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeMouseArea@@SAABUQMetaObject@@XZ @ 1234 NONAME ; struct QMetaObject const & QDeclarativeMouseArea::getStaticMetaObject(void)
-	?getStaticMetaObject@QDeclarativeNumberFormatter@@SAABUQMetaObject@@XZ @ 1235 NONAME ; struct QMetaObject const & QDeclarativeNumberFormatter::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeNumberFormatter@@SAABUQMetaObject@@XZ @ 1235 NONAME ABSENT ; struct QMetaObject const & QDeclarativeNumberFormatter::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativePaintedItem@@SAABUQMetaObject@@XZ @ 1236 NONAME ; struct QMetaObject const & QDeclarativePaintedItem::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeParentChange@@SAABUQMetaObject@@XZ @ 1237 NONAME ; struct QMetaObject const & QDeclarativeParentChange::getStaticMetaObject(void)
-	?getStaticMetaObject@QDeclarativeParticleMotion@@SAABUQMetaObject@@XZ @ 1238 NONAME ; struct QMetaObject const & QDeclarativeParticleMotion::getStaticMetaObject(void)
-	?getStaticMetaObject@QDeclarativeParticleMotionGravity@@SAABUQMetaObject@@XZ @ 1239 NONAME ; struct QMetaObject const & QDeclarativeParticleMotionGravity::getStaticMetaObject(void)
-	?getStaticMetaObject@QDeclarativeParticleMotionLinear@@SAABUQMetaObject@@XZ @ 1240 NONAME ; struct QMetaObject const & QDeclarativeParticleMotionLinear::getStaticMetaObject(void)
-	?getStaticMetaObject@QDeclarativeParticleMotionWander@@SAABUQMetaObject@@XZ @ 1241 NONAME ; struct QMetaObject const & QDeclarativeParticleMotionWander::getStaticMetaObject(void)
-	?getStaticMetaObject@QDeclarativeParticles@@SAABUQMetaObject@@XZ @ 1242 NONAME ; struct QMetaObject const & QDeclarativeParticles::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeParticleMotion@@SAABUQMetaObject@@XZ @ 1238 NONAME ABSENT ; struct QMetaObject const & QDeclarativeParticleMotion::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeParticleMotionGravity@@SAABUQMetaObject@@XZ @ 1239 NONAME ABSENT ; struct QMetaObject const & QDeclarativeParticleMotionGravity::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeParticleMotionLinear@@SAABUQMetaObject@@XZ @ 1240 NONAME ABSENT ; struct QMetaObject const & QDeclarativeParticleMotionLinear::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeParticleMotionWander@@SAABUQMetaObject@@XZ @ 1241 NONAME ABSENT ; struct QMetaObject const & QDeclarativeParticleMotionWander::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeParticles@@SAABUQMetaObject@@XZ @ 1242 NONAME ABSENT ; struct QMetaObject const & QDeclarativeParticles::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativePath@@SAABUQMetaObject@@XZ @ 1243 NONAME ; struct QMetaObject const & QDeclarativePath::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativePathAttribute@@SAABUQMetaObject@@XZ @ 1244 NONAME ; struct QMetaObject const & QDeclarativePathAttribute::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativePathCubic@@SAABUQMetaObject@@XZ @ 1245 NONAME ; struct QMetaObject const & QDeclarativePathCubic::getStaticMetaObject(void)
@@ -1274,8 +1274,8 @@ EXPORTS
 	?getStaticMetaObject@QDeclarativeVisualDataModel@@SAABUQMetaObject@@XZ @ 1273 NONAME ; struct QMetaObject const & QDeclarativeVisualDataModel::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeVisualItemModel@@SAABUQMetaObject@@XZ @ 1274 NONAME ; struct QMetaObject const & QDeclarativeVisualItemModel::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeVisualModel@@SAABUQMetaObject@@XZ @ 1275 NONAME ; struct QMetaObject const & QDeclarativeVisualModel::getStaticMetaObject(void)
-	?getStaticMetaObject@QDeclarativeWebPage@@SAABUQMetaObject@@XZ @ 1276 NONAME ; struct QMetaObject const & QDeclarativeWebPage::getStaticMetaObject(void)
-	?getStaticMetaObject@QDeclarativeWebView@@SAABUQMetaObject@@XZ @ 1277 NONAME ; struct QMetaObject const & QDeclarativeWebView::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeWebPage@@SAABUQMetaObject@@XZ @ 1276 NONAME ABSENT ; struct QMetaObject const & QDeclarativeWebPage::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeWebView@@SAABUQMetaObject@@XZ @ 1277 NONAME ABSENT ; struct QMetaObject const & QDeclarativeWebView::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeXmlListModel@@SAABUQMetaObject@@XZ @ 1278 NONAME ; struct QMetaObject const & QDeclarativeXmlListModel::getStaticMetaObject(void)
 	?getStaticMetaObject@QDeclarativeXmlListModelRole@@SAABUQMetaObject@@XZ @ 1279 NONAME ; struct QMetaObject const & QDeclarativeXmlListModelRole::getStaticMetaObject(void)
 	?getStaticMetaObject@QListModelInterface@@SAABUQMetaObject@@XZ @ 1280 NONAME ; struct QMetaObject const & QListModelInterface::getStaticMetaObject(void)
@@ -1300,11 +1300,11 @@ EXPORTS
 	?header@QDeclarativeListView@@QBEPAVQDeclarativeComponent@@XZ @ 1299 NONAME ; class QDeclarativeComponent * QDeclarativeListView::header(void) const
 	?height@QDeclarativeItem@@QBEMXZ @ 1300 NONAME ; float QDeclarativeItem::height(void) const
 	?height@QDeclarativeParentChange@@QBEMXZ @ 1301 NONAME ; float QDeclarativeParentChange::height(void) const
-	?heightChange@QDeclarativeFlickable@@IAEXXZ @ 1302 NONAME ; void QDeclarativeFlickable::heightChange(void)
-	?heightChanged@QDeclarativeItem@@IAEXXZ @ 1303 NONAME ; void QDeclarativeItem::heightChanged(void)
+	?heightChange@QDeclarativeFlickable@@IAEXXZ @ 1302 NONAME ABSENT ; void QDeclarativeFlickable::heightChange(void)
+	?heightChanged@QDeclarativeItem@@IAEXXZ @ 1303 NONAME ABSENT ; void QDeclarativeItem::heightChanged(void)
 	?heightIsSet@QDeclarativeParentChange@@QBE_NXZ @ 1304 NONAME ; bool QDeclarativeParentChange::heightIsSet(void) const
 	?heightValid@QDeclarativeItem@@IBE_NXZ @ 1305 NONAME ; bool QDeclarativeItem::heightValid(void) const
-	?heuristicZoom@QDeclarativeWebView@@QAE_NHHM@Z @ 1306 NONAME ; bool QDeclarativeWebView::heuristicZoom(int, int, float)
+	?heuristicZoom@QDeclarativeWebView@@QAE_NHHM@Z @ 1306 NONAME ABSENT ; bool QDeclarativeWebView::heuristicZoom(int, int, float)
 	?highlight@QDeclarativeGridView@@QBEPAVQDeclarativeComponent@@XZ @ 1307 NONAME ; class QDeclarativeComponent * QDeclarativeGridView::highlight(void) const
 	?highlight@QDeclarativeListView@@QBEPAVQDeclarativeComponent@@XZ @ 1308 NONAME ; class QDeclarativeComponent * QDeclarativeListView::highlight(void) const
 	?highlight@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 1309 NONAME ; class QColor QDeclarativeSystemPalette::highlight(void) const
@@ -1320,13 +1320,13 @@ EXPORTS
 	?highlightResizeSpeed@QDeclarativeListView@@QBEMXZ @ 1319 NONAME ; float QDeclarativeListView::highlightResizeSpeed(void) const
 	?highlightResizeSpeedChanged@QDeclarativeListView@@IAEXXZ @ 1320 NONAME ; void QDeclarativeListView::highlightResizeSpeedChanged(void)
 	?highlightedText@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 1321 NONAME ; class QColor QDeclarativeSystemPalette::highlightedText(void) const
-	?history@QDeclarativeWebView@@QBEPAVQWebHistory@@XZ @ 1322 NONAME ; class QWebHistory * QDeclarativeWebView::history(void) const
+	?history@QDeclarativeWebView@@QBEPAVQWebHistory@@XZ @ 1322 NONAME ABSENT ; class QWebHistory * QDeclarativeWebView::history(void) const
 	?horizontalAlignmentChanged@QDeclarativeText@@IAEXW4HAlignment@1@@Z @ 1323 NONAME ; void QDeclarativeText::horizontalAlignmentChanged(enum QDeclarativeText::HAlignment)
 	?horizontalAlignmentChanged@QDeclarativeTextEdit@@IAEXW4HAlignment@1@@Z @ 1324 NONAME ; void QDeclarativeTextEdit::horizontalAlignmentChanged(enum QDeclarativeTextEdit::HAlignment)
 	?horizontalAlignmentChanged@QDeclarativeTextInput@@IAEXW4HAlignment@1@@Z @ 1325 NONAME ; void QDeclarativeTextInput::horizontalAlignmentChanged(enum QDeclarativeTextInput::HAlignment)
-	?horizontalCenter@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1326 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::horizontalCenter(void) const
-	?horizontalCenter@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1327 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchors::horizontalCenter(void) const
-	?horizontalCenter@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1328 NONAME ; class QDeclarativeAnchorLine QDeclarativeItem::horizontalCenter(void) const
+	?horizontalCenter@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1326 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::horizontalCenter(void) const
+	?horizontalCenter@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1327 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchors::horizontalCenter(void) const
+	?horizontalCenter@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1328 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeItem::horizontalCenter(void) const
 	?horizontalCenterChanged@QDeclarativeAnchors@@IAEXXZ @ 1329 NONAME ; void QDeclarativeAnchors::horizontalCenterChanged(void)
 	?horizontalCenterOffset@QDeclarativeAnchors@@QBEMXZ @ 1330 NONAME ; float QDeclarativeAnchors::horizontalCenterOffset(void) const
 	?horizontalCenterOffsetChanged@QDeclarativeAnchors@@IAEXXZ @ 1331 NONAME ; void QDeclarativeAnchors::horizontalCenterOffsetChanged(void)
@@ -1338,15 +1338,15 @@ EXPORTS
 	?hoverEnterEvent@QDeclarativeMouseArea@@MAEXPAVQGraphicsSceneHoverEvent@@@Z @ 1337 NONAME ; void QDeclarativeMouseArea::hoverEnterEvent(class QGraphicsSceneHoverEvent *)
 	?hoverLeaveEvent@QDeclarativeMouseArea@@MAEXPAVQGraphicsSceneHoverEvent@@@Z @ 1338 NONAME ; void QDeclarativeMouseArea::hoverLeaveEvent(class QGraphicsSceneHoverEvent *)
 	?hoverMoveEvent@QDeclarativeMouseArea@@MAEXPAVQGraphicsSceneHoverEvent@@@Z @ 1339 NONAME ; void QDeclarativeMouseArea::hoverMoveEvent(class QGraphicsSceneHoverEvent *)
-	?hoverMoveEvent@QDeclarativeWebView@@MAEXPAVQGraphicsSceneHoverEvent@@@Z @ 1340 NONAME ; void QDeclarativeWebView::hoverMoveEvent(class QGraphicsSceneHoverEvent *)
+	?hoverMoveEvent@QDeclarativeWebView@@MAEXPAVQGraphicsSceneHoverEvent@@@Z @ 1340 NONAME ABSENT ; void QDeclarativeWebView::hoverMoveEvent(class QGraphicsSceneHoverEvent *)
 	?hovered@QDeclarativeMouseArea@@QBE_NXZ @ 1341 NONAME ; bool QDeclarativeMouseArea::hovered(void) const
 	?hoveredChanged@QDeclarativeMouseArea@@IAEXXZ @ 1342 NONAME ; void QDeclarativeMouseArea::hoveredChanged(void)
-	?html@QDeclarativeWebView@@QBE?AVQString@@XZ @ 1343 NONAME ; class QString QDeclarativeWebView::html(void) const
-	?htmlChanged@QDeclarativeWebView@@IAEXXZ @ 1344 NONAME ; void QDeclarativeWebView::htmlChanged(void)
-	?icon@QDeclarativeWebView@@QBE?AVQPixmap@@XZ @ 1345 NONAME ; class QPixmap QDeclarativeWebView::icon(void) const
-	?iconChanged@QDeclarativeWebView@@IAEXXZ @ 1346 NONAME ; void QDeclarativeWebView::iconChanged(void)
+	?html@QDeclarativeWebView@@QBE?AVQString@@XZ @ 1343 NONAME ABSENT ; class QString QDeclarativeWebView::html(void) const
+	?htmlChanged@QDeclarativeWebView@@IAEXXZ @ 1344 NONAME ABSENT ; void QDeclarativeWebView::htmlChanged(void)
+	?icon@QDeclarativeWebView@@QBE?AVQPixmap@@XZ @ 1345 NONAME ABSENT ; class QPixmap QDeclarativeWebView::icon(void) const
+	?iconChanged@QDeclarativeWebView@@IAEXXZ @ 1346 NONAME ABSENT ; void QDeclarativeWebView::iconChanged(void)
 	?idForObject@QDeclarativeDebugService@@SAHPAVQObject@@@Z @ 1347 NONAME ; int QDeclarativeDebugService::idForObject(class QObject *)
-	?imageLoaded@QDeclarativeParticles@@AAEXXZ @ 1348 NONAME ; void QDeclarativeParticles::imageLoaded(void)
+	?imageLoaded@QDeclarativeParticles@@AAEXXZ @ 1348 NONAME ABSENT ; void QDeclarativeParticles::imageLoaded(void)
 	?imageProvider@QDeclarativeEngine@@QBEPAVQDeclarativeImageProvider@@ABVQString@@@Z @ 1349 NONAME ; class QDeclarativeImageProvider * QDeclarativeEngine::imageProvider(class QString const &) const
 	?implicitHeight@QDeclarativeItem@@QBEMXZ @ 1350 NONAME ; float QDeclarativeItem::implicitHeight(void) const
 	?implicitWidth@QDeclarativeItem@@QBEMXZ @ 1351 NONAME ; float QDeclarativeItem::implicitWidth(void) const
@@ -1368,10 +1368,10 @@ EXPORTS
 	?indexOfProperty@QMetaObjectBuilder@@QAEHABVQByteArray@@@Z @ 1367 NONAME ; int QMetaObjectBuilder::indexOfProperty(class QByteArray const &)
 	?indexOfSignal@QMetaObjectBuilder@@QAEHABVQByteArray@@@Z @ 1368 NONAME ; int QMetaObjectBuilder::indexOfSignal(class QByteArray const &)
 	?indexOfSlot@QMetaObjectBuilder@@QAEHABVQByteArray@@@Z @ 1369 NONAME ; int QMetaObjectBuilder::indexOfSlot(class QByteArray const &)
-	?init@QDeclarativeContextPrivate@@QAEXXZ @ 1370 NONAME ; void QDeclarativeContextPrivate::init(void)
+	?init@QDeclarativeContextPrivate@@QAEXXZ @ 1370 NONAME ABSENT ; void QDeclarativeContextPrivate::init(void)
 	?init@QDeclarativePaintedItem@@AAEXXZ @ 1371 NONAME ; void QDeclarativePaintedItem::init(void)
-	?init@QDeclarativeWebView@@AAEXXZ @ 1372 NONAME ; void QDeclarativeWebView::init(void)
-	?initialLayout@QDeclarativeWebView@@AAEXXZ @ 1373 NONAME ; void QDeclarativeWebView::initialLayout(void)
+	?init@QDeclarativeWebView@@AAEXXZ @ 1372 NONAME ABSENT ; void QDeclarativeWebView::init(void)
+	?initialLayout@QDeclarativeWebView@@AAEXXZ @ 1373 NONAME ABSENT ; void QDeclarativeWebView::initialLayout(void)
 	?initialValue@QDeclarativeOpenMetaObject@@UAE?AVQVariant@@H@Z @ 1374 NONAME ; class QVariant QDeclarativeOpenMetaObject::initialValue(int)
 	?initializeEngine@QDeclarativeExtensionPlugin@@UAEXPAVQDeclarativeEngine@@PBD@Z @ 1375 NONAME ; void QDeclarativeExtensionPlugin::initializeEngine(class QDeclarativeEngine *, char const *)
 	?inputMask@QDeclarativeTextInput@@QBE?AVQString@@XZ @ 1376 NONAME ; class QString QDeclarativeTextInput::inputMask(void) const
@@ -1389,7 +1389,7 @@ EXPORTS
 	?interpolate@QDeclarativePath@@AAEXHABVQString@@M@Z @ 1388 NONAME ; void QDeclarativePath::interpolate(int, class QString const &, float)
 	?interval@QDeclarativeTimer@@QBEHXZ @ 1389 NONAME ; int QDeclarativeTimer::interval(void) const
 	?invalidPacket@QPacketProtocol@@IAEXXZ @ 1390 NONAME ; void QPacketProtocol::invalidPacket(void)
-	?invalidateEngines@QDeclarativeContextPrivate@@QAEXXZ @ 1391 NONAME ; void QDeclarativeContextPrivate::invalidateEngines(void)
+	?invalidateEngines@QDeclarativeContextPrivate@@QAEXXZ @ 1391 NONAME ABSENT ; void QDeclarativeContextPrivate::invalidateEngines(void)
 	?isAlias@QDeclarativeDomDynamicProperty@@QBE_NXZ @ 1392 NONAME ; bool QDeclarativeDomDynamicProperty::isAlias(void) const
 	?isAtBoundaryChanged@QDeclarativeFlickable@@IAEXXZ @ 1393 NONAME ; void QDeclarativeFlickable::isAtBoundaryChanged(void)
 	?isAtXBeginning@QDeclarativeFlickable@@QBE_NXZ @ 1394 NONAME ; bool QDeclarativeFlickable::isAtXBeginning(void) const
@@ -1470,7 +1470,7 @@ EXPORTS
 	?isValid@QDeclarativeVisualDataModel@@UBE_NXZ @ 1469 NONAME ; bool QDeclarativeVisualDataModel::isValid(void) const
 	?isValid@QDeclarativeVisualItemModel@@UBE_NXZ @ 1470 NONAME ; bool QDeclarativeVisualItemModel::isValid(void) const
 	?isValid@QDeclarativeXmlListModelRole@@QAE_NXZ @ 1471 NONAME ; bool QDeclarativeXmlListModelRole::isValid(void)
-	?isValidId@QDeclarativeCompiler@@SA_NABVQString@@@Z @ 1472 NONAME ; bool QDeclarativeCompiler::isValidId(class QString const &)
+	?isValidId@QDeclarativeCompiler@@SA_NABVQString@@@Z @ 1472 NONAME ABSENT ; bool QDeclarativeCompiler::isValidId(class QString const &)
 	?isValueInterceptor@QDeclarativeDomValue@@QBE_NXZ @ 1473 NONAME ; bool QDeclarativeDomValue::isValueInterceptor(void) const
 	?isValueSource@QDeclarativeDomValue@@QBE_NXZ @ 1474 NONAME ; bool QDeclarativeDomValue::isValueSource(void) const
 	?isWaiting@QDeclarativeDebugQuery@@QBE_NXZ @ 1475 NONAME ; bool QDeclarativeDebugQuery::isWaiting(void) const
@@ -1507,11 +1507,11 @@ EXPORTS
 	?itemsRemoved@QDeclarativeRepeater@@AAEXHH@Z @ 1506 NONAME ; void QDeclarativeRepeater::itemsRemoved(int, int)
 	?itemsRemoved@QDeclarativeVisualModel@@IAEXHH@Z @ 1507 NONAME ; void QDeclarativeVisualModel::itemsRemoved(int, int)
 	?itemsRemoved@QListModelInterface@@IAEXHH@Z @ 1508 NONAME ; void QListModelInterface::itemsRemoved(int, int)
-	?javaScriptAlert@QDeclarativeWebPage@@MAEXPAVQWebFrame@@ABVQString@@@Z @ 1509 NONAME ; void QDeclarativeWebPage::javaScriptAlert(class QWebFrame *, class QString const &)
-	?javaScriptConfirm@QDeclarativeWebPage@@MAE_NPAVQWebFrame@@ABVQString@@@Z @ 1510 NONAME ; bool QDeclarativeWebPage::javaScriptConfirm(class QWebFrame *, class QString const &)
-	?javaScriptConsoleMessage@QDeclarativeWebPage@@MAEXABVQString@@H0@Z @ 1511 NONAME ; void QDeclarativeWebPage::javaScriptConsoleMessage(class QString const &, int, class QString const &)
-	?javaScriptPrompt@QDeclarativeWebPage@@MAE_NPAVQWebFrame@@ABVQString@@1PAV3@@Z @ 1512 NONAME ; bool QDeclarativeWebPage::javaScriptPrompt(class QWebFrame *, class QString const &, class QString const &, class QString *)
-	?javaScriptWindowObjects@QDeclarativeWebView@@QAE?AU?$QDeclarativeListProperty@VQObject@@@@XZ @ 1513 NONAME ; struct QDeclarativeListProperty<class QObject> QDeclarativeWebView::javaScriptWindowObjects(void)
+	?javaScriptAlert@QDeclarativeWebPage@@MAEXPAVQWebFrame@@ABVQString@@@Z @ 1509 NONAME ABSENT ; void QDeclarativeWebPage::javaScriptAlert(class QWebFrame *, class QString const &)
+	?javaScriptConfirm@QDeclarativeWebPage@@MAE_NPAVQWebFrame@@ABVQString@@@Z @ 1510 NONAME ABSENT ; bool QDeclarativeWebPage::javaScriptConfirm(class QWebFrame *, class QString const &)
+	?javaScriptConsoleMessage@QDeclarativeWebPage@@MAEXABVQString@@H0@Z @ 1511 NONAME ABSENT ; void QDeclarativeWebPage::javaScriptConsoleMessage(class QString const &, int, class QString const &)
+	?javaScriptPrompt@QDeclarativeWebPage@@MAE_NPAVQWebFrame@@ABVQString@@1PAV3@@Z @ 1512 NONAME ABSENT ; bool QDeclarativeWebPage::javaScriptPrompt(class QWebFrame *, class QString const &, class QString const &, class QString *)
+	?javaScriptWindowObjects@QDeclarativeWebView@@QAE?AU?$QDeclarativeListProperty@VQObject@@@@XZ @ 1513 NONAME ABSENT ; struct QDeclarativeListProperty<class QObject> QDeclarativeWebView::javaScriptWindowObjects(void)
 	?keepMouseGrab@QDeclarativeItem@@QBE_NXZ @ 1514 NONAME ; bool QDeclarativeItem::keepMouseGrab(void) const
 	?key@QMetaEnumBuilder@@QBE?AVQByteArray@@H@Z @ 1515 NONAME ; class QByteArray QMetaEnumBuilder::key(int) const
 	?keyCount@QMetaEnumBuilder@@QBEHXZ @ 1516 NONAME ; int QMetaEnumBuilder::keyCount(void) const
@@ -1520,15 +1520,15 @@ EXPORTS
 	?keyPressEvent@QDeclarativeListView@@MAEXPAVQKeyEvent@@@Z @ 1519 NONAME ; void QDeclarativeListView::keyPressEvent(class QKeyEvent *)
 	?keyPressEvent@QDeclarativeTextEdit@@MAEXPAVQKeyEvent@@@Z @ 1520 NONAME ; void QDeclarativeTextEdit::keyPressEvent(class QKeyEvent *)
 	?keyPressEvent@QDeclarativeTextInput@@MAEXPAVQKeyEvent@@@Z @ 1521 NONAME ; void QDeclarativeTextInput::keyPressEvent(class QKeyEvent *)
-	?keyPressEvent@QDeclarativeWebView@@MAEXPAVQKeyEvent@@@Z @ 1522 NONAME ; void QDeclarativeWebView::keyPressEvent(class QKeyEvent *)
+	?keyPressEvent@QDeclarativeWebView@@MAEXPAVQKeyEvent@@@Z @ 1522 NONAME ABSENT ; void QDeclarativeWebView::keyPressEvent(class QKeyEvent *)
 	?keyReleaseEvent@QDeclarativeItem@@MAEXPAVQKeyEvent@@@Z @ 1523 NONAME ; void QDeclarativeItem::keyReleaseEvent(class QKeyEvent *)
 	?keyReleaseEvent@QDeclarativeTextEdit@@MAEXPAVQKeyEvent@@@Z @ 1524 NONAME ; void QDeclarativeTextEdit::keyReleaseEvent(class QKeyEvent *)
-	?keyReleaseEvent@QDeclarativeWebView@@MAEXPAVQKeyEvent@@@Z @ 1525 NONAME ; void QDeclarativeWebView::keyReleaseEvent(class QKeyEvent *)
+	?keyReleaseEvent@QDeclarativeWebView@@MAEXPAVQKeyEvent@@@Z @ 1525 NONAME ABSENT ; void QDeclarativeWebView::keyReleaseEvent(class QKeyEvent *)
 	?keys@QDeclarativePropertyMap@@QBE?AVQStringList@@XZ @ 1526 NONAME ; class QStringList QDeclarativePropertyMap::keys(void) const
-	?layout@QDeclarativeGridView@@AAEXXZ @ 1527 NONAME ; void QDeclarativeGridView::layout(void)
-	?left@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1528 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::left(void) const
-	?left@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1529 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchors::left(void) const
-	?left@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1530 NONAME ; class QDeclarativeAnchorLine QDeclarativeItem::left(void) const
+	?layout@QDeclarativeGridView@@AAEXXZ @ 1527 NONAME ABSENT ; void QDeclarativeGridView::layout(void)
+	?left@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1528 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::left(void) const
+	?left@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1529 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchors::left(void) const
+	?left@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 1530 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeItem::left(void) const
 	?left@QDeclarativeScaleGrid@@QBEHXZ @ 1531 NONAME ; int QDeclarativeScaleGrid::left(void) const
 	?leftChanged@QDeclarativeAnchors@@IAEXXZ @ 1532 NONAME ; void QDeclarativeAnchors::leftChanged(void)
 	?leftMargin@QDeclarativeAnchors@@QBEMXZ @ 1533 NONAME ; float QDeclarativeAnchors::leftMargin(void) const
@@ -1538,10 +1538,10 @@ EXPORTS
 	?length@QDeclarativeDomObject@@QBEHXZ @ 1537 NONAME ; int QDeclarativeDomObject::length(void) const
 	?length@QDeclarativeDomProperty@@QBEHXZ @ 1538 NONAME ; int QDeclarativeDomProperty::length(void) const
 	?length@QDeclarativeDomValue@@QBEHXZ @ 1539 NONAME ; int QDeclarativeDomValue::length(void) const
-	?lifeSpan@QDeclarativeParticles@@QBEHXZ @ 1540 NONAME ; int QDeclarativeParticles::lifeSpan(void) const
-	?lifeSpanChanged@QDeclarativeParticles@@IAEXXZ @ 1541 NONAME ; void QDeclarativeParticles::lifeSpanChanged(void)
-	?lifeSpanDeviation@QDeclarativeParticles@@QBEHXZ @ 1542 NONAME ; int QDeclarativeParticles::lifeSpanDeviation(void) const
-	?lifeSpanDeviationChanged@QDeclarativeParticles@@IAEXXZ @ 1543 NONAME ; void QDeclarativeParticles::lifeSpanDeviationChanged(void)
+	?lifeSpan@QDeclarativeParticles@@QBEHXZ @ 1540 NONAME ABSENT ; int QDeclarativeParticles::lifeSpan(void) const
+	?lifeSpanChanged@QDeclarativeParticles@@IAEXXZ @ 1541 NONAME ABSENT ; void QDeclarativeParticles::lifeSpanChanged(void)
+	?lifeSpanDeviation@QDeclarativeParticles@@QBEHXZ @ 1542 NONAME ABSENT ; int QDeclarativeParticles::lifeSpanDeviation(void) const
+	?lifeSpanDeviationChanged@QDeclarativeParticles@@IAEXXZ @ 1543 NONAME ABSENT ; void QDeclarativeParticles::lifeSpanDeviationChanged(void)
 	?light@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 1544 NONAME ; class QColor QDeclarativeSystemPalette::light(void) const
 	?line@QDeclarativeError@@QBEHXZ @ 1545 NONAME ; int QDeclarativeError::line(void) const
 	?lineNumber@QDeclarativeDebugFileReference@@QBEHXZ @ 1546 NONAME ; int QDeclarativeDebugFileReference::lineNumber(void) const
@@ -1554,15 +1554,15 @@ EXPORTS
 	?load@QDeclarativeBorderImage@@MAEXXZ @ 1553 NONAME ; void QDeclarativeBorderImage::load(void)
 	?load@QDeclarativeDomDocument@@QAE_NPAVQDeclarativeEngine@@ABVQByteArray@@ABVQUrl@@@Z @ 1554 NONAME ; bool QDeclarativeDomDocument::load(class QDeclarativeEngine *, class QByteArray const &, class QUrl const &)
 	?load@QDeclarativeImageBase@@MAEXXZ @ 1555 NONAME ; void QDeclarativeImageBase::load(void)
-	?load@QDeclarativeWebView@@QAEXABVQNetworkRequest@@W4Operation@QNetworkAccessManager@@ABVQByteArray@@@Z @ 1556 NONAME ; void QDeclarativeWebView::load(class QNetworkRequest const &, enum QNetworkAccessManager::Operation, class QByteArray const &)
+	?load@QDeclarativeWebView@@QAEXABVQNetworkRequest@@W4Operation@QNetworkAccessManager@@ABVQByteArray@@@Z @ 1556 NONAME ABSENT ; void QDeclarativeWebView::load(class QNetworkRequest const &, enum QNetworkAccessManager::Operation, class QByteArray const &)
 	?loadCursorDelegate@QDeclarativeTextEdit@@AAEXXZ @ 1557 NONAME ; void QDeclarativeTextEdit::loadCursorDelegate(void)
-	?loadFailed@QDeclarativeWebView@@IAEXXZ @ 1558 NONAME ; void QDeclarativeWebView::loadFailed(void)
-	?loadFinished@QDeclarativeWebView@@IAEXXZ @ 1559 NONAME ; void QDeclarativeWebView::loadFinished(void)
-	?loadStarted@QDeclarativeWebView@@IAEXXZ @ 1560 NONAME ; void QDeclarativeWebView::loadStarted(void)
+	?loadFailed@QDeclarativeWebView@@IAEXXZ @ 1558 NONAME ABSENT ; void QDeclarativeWebView::loadFailed(void)
+	?loadFinished@QDeclarativeWebView@@IAEXXZ @ 1559 NONAME ABSENT ; void QDeclarativeWebView::loadFinished(void)
+	?loadStarted@QDeclarativeWebView@@IAEXXZ @ 1560 NONAME ABSENT ; void QDeclarativeWebView::loadStarted(void)
 	?loadUrl@QDeclarativeComponent@@QAEXABVQUrl@@@Z @ 1561 NONAME ; void QDeclarativeComponent::loadUrl(class QUrl const &)
 	?location@QDeclarativeCustomParserNode@@QBE?AULocation@QDeclarativeParser@@XZ @ 1562 NONAME ; struct QDeclarativeParser::Location QDeclarativeCustomParserNode::location(void) const
 	?location@QDeclarativeCustomParserProperty@@QBE?AULocation@QDeclarativeParser@@XZ @ 1563 NONAME ; struct QDeclarativeParser::Location QDeclarativeCustomParserProperty::location(void) const
-	?longStyle@QDeclarativeDateTimeFormatter@@QBE_NXZ @ 1564 NONAME ; bool QDeclarativeDateTimeFormatter::longStyle(void) const
+	?longStyle@QDeclarativeDateTimeFormatter@@QBE_NXZ @ 1564 NONAME ABSENT ; bool QDeclarativeDateTimeFormatter::longStyle(void) const
 	?majorVersion@QDeclarativeType@@QBEHXZ @ 1565 NONAME ; int QDeclarativeType::majorVersion(void) const
 	?margins@QDeclarativeAnchors@@QBEMXZ @ 1566 NONAME ; float QDeclarativeAnchors::margins(void) const
 	?marginsChanged@QDeclarativeAnchors@@IAEXXZ @ 1567 NONAME ; void QDeclarativeAnchors::marginsChanged(void)
@@ -1575,8 +1575,8 @@ EXPORTS
 	?maxYExtent@QDeclarativeFlickable@@MBEMXZ @ 1574 NONAME ; float QDeclarativeFlickable::maxYExtent(void) const
 	?maxYExtent@QDeclarativeGridView@@MBEMXZ @ 1575 NONAME ; float QDeclarativeGridView::maxYExtent(void) const
 	?maxYExtent@QDeclarativeListView@@MBEMXZ @ 1576 NONAME ; float QDeclarativeListView::maxYExtent(void) const
-	?maximumEasingTime@QDeclarativeEaseFollow@@QBEMXZ @ 1577 NONAME ; float QDeclarativeEaseFollow::maximumEasingTime(void) const
-	?maximumEasingTimeChanged@QDeclarativeEaseFollow@@IAEXXZ @ 1578 NONAME ; void QDeclarativeEaseFollow::maximumEasingTimeChanged(void)
+	?maximumEasingTime@QDeclarativeEaseFollow@@QBEMXZ @ 1577 NONAME ABSENT ; float QDeclarativeEaseFollow::maximumEasingTime(void) const
+	?maximumEasingTimeChanged@QDeclarativeEaseFollow@@IAEXXZ @ 1578 NONAME ABSENT ; void QDeclarativeEaseFollow::maximumEasingTimeChanged(void)
 	?maximumFlickVelocity@QDeclarativeFlickable@@QBEMXZ @ 1579 NONAME ; float QDeclarativeFlickable::maximumFlickVelocity(void) const
 	?maximumFlickVelocityChanged@QDeclarativeFlickable@@IAEXXZ @ 1580 NONAME ; void QDeclarativeFlickable::maximumFlickVelocityChanged(void)
 	?maximumLengthChanged@QDeclarativeTextInput@@IAEXH@Z @ 1581 NONAME ; void QDeclarativeTextInput::maximumLengthChanged(int)
@@ -1599,7 +1599,7 @@ EXPORTS
 	?metaObject@QDeclarativeConnections@@UBEPBUQMetaObject@@XZ @ 1598 NONAME ; struct QMetaObject const * QDeclarativeConnections::metaObject(void) const
 	?metaObject@QDeclarativeContext@@UBEPBUQMetaObject@@XZ @ 1599 NONAME ; struct QMetaObject const * QDeclarativeContext::metaObject(void) const
 	?metaObject@QDeclarativeCurve@@UBEPBUQMetaObject@@XZ @ 1600 NONAME ; struct QMetaObject const * QDeclarativeCurve::metaObject(void) const
-	?metaObject@QDeclarativeDateTimeFormatter@@UBEPBUQMetaObject@@XZ @ 1601 NONAME ; struct QMetaObject const * QDeclarativeDateTimeFormatter::metaObject(void) const
+	?metaObject@QDeclarativeDateTimeFormatter@@UBEPBUQMetaObject@@XZ @ 1601 NONAME ABSENT ; struct QMetaObject const * QDeclarativeDateTimeFormatter::metaObject(void) const
 	?metaObject@QDeclarativeDebugClient@@UBEPBUQMetaObject@@XZ @ 1602 NONAME ; struct QMetaObject const * QDeclarativeDebugClient::metaObject(void) const
 	?metaObject@QDeclarativeDebugConnection@@UBEPBUQMetaObject@@XZ @ 1603 NONAME ; struct QMetaObject const * QDeclarativeDebugConnection::metaObject(void) const
 	?metaObject@QDeclarativeDebugEnginesQuery@@UBEPBUQMetaObject@@XZ @ 1604 NONAME ; struct QMetaObject const * QDeclarativeDebugEnginesQuery::metaObject(void) const
@@ -1612,7 +1612,7 @@ EXPORTS
 	?metaObject@QDeclarativeDebugService@@UBEPBUQMetaObject@@XZ @ 1611 NONAME ; struct QMetaObject const * QDeclarativeDebugService::metaObject(void) const
 	?metaObject@QDeclarativeDebugWatch@@UBEPBUQMetaObject@@XZ @ 1612 NONAME ; struct QMetaObject const * QDeclarativeDebugWatch::metaObject(void) const
 	?metaObject@QDeclarativeDrag@@UBEPBUQMetaObject@@XZ @ 1613 NONAME ; struct QMetaObject const * QDeclarativeDrag::metaObject(void) const
-	?metaObject@QDeclarativeEaseFollow@@UBEPBUQMetaObject@@XZ @ 1614 NONAME ; struct QMetaObject const * QDeclarativeEaseFollow::metaObject(void) const
+	?metaObject@QDeclarativeEaseFollow@@UBEPBUQMetaObject@@XZ @ 1614 NONAME ABSENT ; struct QMetaObject const * QDeclarativeEaseFollow::metaObject(void) const
 	?metaObject@QDeclarativeEngine@@UBEPBUQMetaObject@@XZ @ 1615 NONAME ; struct QMetaObject const * QDeclarativeEngine::metaObject(void) const
 	?metaObject@QDeclarativeEngineDebug@@UBEPBUQMetaObject@@XZ @ 1616 NONAME ; struct QMetaObject const * QDeclarativeEngineDebug::metaObject(void) const
 	?metaObject@QDeclarativeExpression@@UBEPBUQMetaObject@@XZ @ 1617 NONAME ; struct QMetaObject const * QDeclarativeExpression::metaObject(void) const
@@ -1635,14 +1635,14 @@ EXPORTS
 	?metaObject@QDeclarativeListView@@UBEPBUQMetaObject@@XZ @ 1634 NONAME ; struct QMetaObject const * QDeclarativeListView::metaObject(void) const
 	?metaObject@QDeclarativeLoader@@UBEPBUQMetaObject@@XZ @ 1635 NONAME ; struct QMetaObject const * QDeclarativeLoader::metaObject(void) const
 	?metaObject@QDeclarativeMouseArea@@UBEPBUQMetaObject@@XZ @ 1636 NONAME ; struct QMetaObject const * QDeclarativeMouseArea::metaObject(void) const
-	?metaObject@QDeclarativeNumberFormatter@@UBEPBUQMetaObject@@XZ @ 1637 NONAME ; struct QMetaObject const * QDeclarativeNumberFormatter::metaObject(void) const
+	?metaObject@QDeclarativeNumberFormatter@@UBEPBUQMetaObject@@XZ @ 1637 NONAME ABSENT ; struct QMetaObject const * QDeclarativeNumberFormatter::metaObject(void) const
 	?metaObject@QDeclarativePaintedItem@@UBEPBUQMetaObject@@XZ @ 1638 NONAME ; struct QMetaObject const * QDeclarativePaintedItem::metaObject(void) const
 	?metaObject@QDeclarativeParentChange@@UBEPBUQMetaObject@@XZ @ 1639 NONAME ; struct QMetaObject const * QDeclarativeParentChange::metaObject(void) const
-	?metaObject@QDeclarativeParticleMotion@@UBEPBUQMetaObject@@XZ @ 1640 NONAME ; struct QMetaObject const * QDeclarativeParticleMotion::metaObject(void) const
-	?metaObject@QDeclarativeParticleMotionGravity@@UBEPBUQMetaObject@@XZ @ 1641 NONAME ; struct QMetaObject const * QDeclarativeParticleMotionGravity::metaObject(void) const
-	?metaObject@QDeclarativeParticleMotionLinear@@UBEPBUQMetaObject@@XZ @ 1642 NONAME ; struct QMetaObject const * QDeclarativeParticleMotionLinear::metaObject(void) const
-	?metaObject@QDeclarativeParticleMotionWander@@UBEPBUQMetaObject@@XZ @ 1643 NONAME ; struct QMetaObject const * QDeclarativeParticleMotionWander::metaObject(void) const
-	?metaObject@QDeclarativeParticles@@UBEPBUQMetaObject@@XZ @ 1644 NONAME ; struct QMetaObject const * QDeclarativeParticles::metaObject(void) const
+	?metaObject@QDeclarativeParticleMotion@@UBEPBUQMetaObject@@XZ @ 1640 NONAME ABSENT ; struct QMetaObject const * QDeclarativeParticleMotion::metaObject(void) const
+	?metaObject@QDeclarativeParticleMotionGravity@@UBEPBUQMetaObject@@XZ @ 1641 NONAME ABSENT ; struct QMetaObject const * QDeclarativeParticleMotionGravity::metaObject(void) const
+	?metaObject@QDeclarativeParticleMotionLinear@@UBEPBUQMetaObject@@XZ @ 1642 NONAME ABSENT ; struct QMetaObject const * QDeclarativeParticleMotionLinear::metaObject(void) const
+	?metaObject@QDeclarativeParticleMotionWander@@UBEPBUQMetaObject@@XZ @ 1643 NONAME ABSENT ; struct QMetaObject const * QDeclarativeParticleMotionWander::metaObject(void) const
+	?metaObject@QDeclarativeParticles@@UBEPBUQMetaObject@@XZ @ 1644 NONAME ABSENT ; struct QMetaObject const * QDeclarativeParticles::metaObject(void) const
 	?metaObject@QDeclarativePath@@UBEPBUQMetaObject@@XZ @ 1645 NONAME ; struct QMetaObject const * QDeclarativePath::metaObject(void) const
 	?metaObject@QDeclarativePathAttribute@@UBEPBUQMetaObject@@XZ @ 1646 NONAME ; struct QMetaObject const * QDeclarativePathAttribute::metaObject(void) const
 	?metaObject@QDeclarativePathCubic@@UBEPBUQMetaObject@@XZ @ 1647 NONAME ; struct QMetaObject const * QDeclarativePathCubic::metaObject(void) const
@@ -1677,8 +1677,8 @@ EXPORTS
 	?metaObject@QDeclarativeVisualDataModel@@UBEPBUQMetaObject@@XZ @ 1676 NONAME ; struct QMetaObject const * QDeclarativeVisualDataModel::metaObject(void) const
 	?metaObject@QDeclarativeVisualItemModel@@UBEPBUQMetaObject@@XZ @ 1677 NONAME ; struct QMetaObject const * QDeclarativeVisualItemModel::metaObject(void) const
 	?metaObject@QDeclarativeVisualModel@@UBEPBUQMetaObject@@XZ @ 1678 NONAME ; struct QMetaObject const * QDeclarativeVisualModel::metaObject(void) const
-	?metaObject@QDeclarativeWebPage@@UBEPBUQMetaObject@@XZ @ 1679 NONAME ; struct QMetaObject const * QDeclarativeWebPage::metaObject(void) const
-	?metaObject@QDeclarativeWebView@@UBEPBUQMetaObject@@XZ @ 1680 NONAME ; struct QMetaObject const * QDeclarativeWebView::metaObject(void) const
+	?metaObject@QDeclarativeWebPage@@UBEPBUQMetaObject@@XZ @ 1679 NONAME ABSENT ; struct QMetaObject const * QDeclarativeWebPage::metaObject(void) const
+	?metaObject@QDeclarativeWebView@@UBEPBUQMetaObject@@XZ @ 1680 NONAME ABSENT ; struct QMetaObject const * QDeclarativeWebView::metaObject(void) const
 	?metaObject@QDeclarativeXmlListModel@@UBEPBUQMetaObject@@XZ @ 1681 NONAME ; struct QMetaObject const * QDeclarativeXmlListModel::metaObject(void) const
 	?metaObject@QDeclarativeXmlListModelRole@@UBEPBUQMetaObject@@XZ @ 1682 NONAME ; struct QMetaObject const * QDeclarativeXmlListModelRole::metaObject(void) const
 	?metaObject@QListModelInterface@@UBEPBUQMetaObject@@XZ @ 1683 NONAME ; struct QMetaObject const * QListModelInterface::metaObject(void) const
@@ -1711,30 +1711,30 @@ EXPORTS
 	?modelReset@QDeclarativeVisualModel@@IAEXXZ @ 1710 NONAME ; void QDeclarativeVisualModel::modelReset(void)
 	?modulus@QDeclarativeSpringFollow@@QBEMXZ @ 1711 NONAME ; float QDeclarativeSpringFollow::modulus(void) const
 	?modulusChanged@QDeclarativeSpringFollow@@IAEXXZ @ 1712 NONAME ; void QDeclarativeSpringFollow::modulusChanged(void)
-	?motion@QDeclarativeParticles@@QBEPAVQDeclarativeParticleMotion@@XZ @ 1713 NONAME ; class QDeclarativeParticleMotion * QDeclarativeParticles::motion(void) const
-	?motionChanged@QDeclarativeParticles@@IAEXXZ @ 1714 NONAME ; void QDeclarativeParticles::motionChanged(void)
+	?motion@QDeclarativeParticles@@QBEPAVQDeclarativeParticleMotion@@XZ @ 1713 NONAME ABSENT ; class QDeclarativeParticleMotion * QDeclarativeParticles::motion(void) const
+	?motionChanged@QDeclarativeParticles@@IAEXXZ @ 1714 NONAME ABSENT ; void QDeclarativeParticles::motionChanged(void)
 	?mouseDoubleClickEvent@QDeclarativeMouseArea@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1715 NONAME ; void QDeclarativeMouseArea::mouseDoubleClickEvent(class QGraphicsSceneMouseEvent *)
 	?mouseDoubleClickEvent@QDeclarativeTextEdit@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1716 NONAME ; void QDeclarativeTextEdit::mouseDoubleClickEvent(class QGraphicsSceneMouseEvent *)
-	?mouseDoubleClickEvent@QDeclarativeWebView@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1717 NONAME ; void QDeclarativeWebView::mouseDoubleClickEvent(class QGraphicsSceneMouseEvent *)
+	?mouseDoubleClickEvent@QDeclarativeWebView@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1717 NONAME ABSENT ; void QDeclarativeWebView::mouseDoubleClickEvent(class QGraphicsSceneMouseEvent *)
 	?mouseMoveEvent@QDeclarativeFlickable@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1718 NONAME ; void QDeclarativeFlickable::mouseMoveEvent(class QGraphicsSceneMouseEvent *)
 	?mouseMoveEvent@QDeclarativeMouseArea@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1719 NONAME ; void QDeclarativeMouseArea::mouseMoveEvent(class QGraphicsSceneMouseEvent *)
 	?mouseMoveEvent@QDeclarativePathView@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1720 NONAME ; void QDeclarativePathView::mouseMoveEvent(class QGraphicsSceneMouseEvent *)
 	?mouseMoveEvent@QDeclarativeTextEdit@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1721 NONAME ; void QDeclarativeTextEdit::mouseMoveEvent(class QGraphicsSceneMouseEvent *)
-	?mouseMoveEvent@QDeclarativeWebView@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1722 NONAME ; void QDeclarativeWebView::mouseMoveEvent(class QGraphicsSceneMouseEvent *)
+	?mouseMoveEvent@QDeclarativeWebView@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1722 NONAME ABSENT ; void QDeclarativeWebView::mouseMoveEvent(class QGraphicsSceneMouseEvent *)
 	?mousePressEvent@QDeclarativeFlickable@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1723 NONAME ; void QDeclarativeFlickable::mousePressEvent(class QGraphicsSceneMouseEvent *)
 	?mousePressEvent@QDeclarativeMouseArea@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1724 NONAME ; void QDeclarativeMouseArea::mousePressEvent(class QGraphicsSceneMouseEvent *)
 	?mousePressEvent@QDeclarativePathView@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1725 NONAME ; void QDeclarativePathView::mousePressEvent(class QGraphicsSceneMouseEvent *)
 	?mousePressEvent@QDeclarativeText@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1726 NONAME ; void QDeclarativeText::mousePressEvent(class QGraphicsSceneMouseEvent *)
 	?mousePressEvent@QDeclarativeTextEdit@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1727 NONAME ; void QDeclarativeTextEdit::mousePressEvent(class QGraphicsSceneMouseEvent *)
 	?mousePressEvent@QDeclarativeTextInput@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1728 NONAME ; void QDeclarativeTextInput::mousePressEvent(class QGraphicsSceneMouseEvent *)
-	?mousePressEvent@QDeclarativeWebView@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1729 NONAME ; void QDeclarativeWebView::mousePressEvent(class QGraphicsSceneMouseEvent *)
+	?mousePressEvent@QDeclarativeWebView@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1729 NONAME ABSENT ; void QDeclarativeWebView::mousePressEvent(class QGraphicsSceneMouseEvent *)
 	?mouseReleaseEvent@QDeclarativeFlickable@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1730 NONAME ; void QDeclarativeFlickable::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
 	?mouseReleaseEvent@QDeclarativeMouseArea@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1731 NONAME ; void QDeclarativeMouseArea::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
 	?mouseReleaseEvent@QDeclarativePathView@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1732 NONAME ; void QDeclarativePathView::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
 	?mouseReleaseEvent@QDeclarativeText@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1733 NONAME ; void QDeclarativeText::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
 	?mouseReleaseEvent@QDeclarativeTextEdit@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1734 NONAME ; void QDeclarativeTextEdit::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
 	?mouseReleaseEvent@QDeclarativeTextInput@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1735 NONAME ; void QDeclarativeTextInput::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
-	?mouseReleaseEvent@QDeclarativeWebView@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1736 NONAME ; void QDeclarativeWebView::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
+	?mouseReleaseEvent@QDeclarativeWebView@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 1736 NONAME ABSENT ; void QDeclarativeWebView::mouseReleaseEvent(class QGraphicsSceneMouseEvent *)
 	?mouseX@QDeclarativeMouseArea@@QBEMXZ @ 1737 NONAME ; float QDeclarativeMouseArea::mouseX(void) const
 	?mouseY@QDeclarativeMouseArea@@QBEMXZ @ 1738 NONAME ; float QDeclarativeMouseArea::mouseY(void) const
 	?move@QDeclarativeBasePositioner@@QBEPAVQDeclarativeTransition@@XZ @ 1739 NONAME ; class QDeclarativeTransition * QDeclarativeBasePositioner::move(void) const
@@ -1776,15 +1776,15 @@ EXPORTS
 	?needsNotifySignal@QDeclarativeProperty@@QBE_NXZ @ 1775 NONAME ; bool QDeclarativeProperty::needsNotifySignal(void) const
 	?networkAccessManager@QDeclarativeEngine@@QBEPAVQNetworkAccessManager@@XZ @ 1776 NONAME ; class QNetworkAccessManager * QDeclarativeEngine::networkAccessManager(void) const
 	?networkAccessManagerFactory@QDeclarativeEngine@@QBEPAVQDeclarativeNetworkAccessManagerFactory@@XZ @ 1777 NONAME ; class QDeclarativeNetworkAccessManagerFactory * QDeclarativeEngine::networkAccessManagerFactory(void) const
-	?newWindowComponent@QDeclarativeWebView@@QBEPAVQDeclarativeComponent@@XZ @ 1778 NONAME ; class QDeclarativeComponent * QDeclarativeWebView::newWindowComponent(void) const
-	?newWindowComponentChanged@QDeclarativeWebView@@IAEXXZ @ 1779 NONAME ; void QDeclarativeWebView::newWindowComponentChanged(void)
-	?newWindowParent@QDeclarativeWebView@@QBEPAVQDeclarativeItem@@XZ @ 1780 NONAME ; class QDeclarativeItem * QDeclarativeWebView::newWindowParent(void) const
-	?newWindowParentChanged@QDeclarativeWebView@@IAEXXZ @ 1781 NONAME ; void QDeclarativeWebView::newWindowParentChanged(void)
-	?noteContentsSizeChanged@QDeclarativeWebView@@AAEXABVQSize@@@Z @ 1782 NONAME ; void QDeclarativeWebView::noteContentsSizeChanged(class QSize const &)
+	?newWindowComponent@QDeclarativeWebView@@QBEPAVQDeclarativeComponent@@XZ @ 1778 NONAME ABSENT ; class QDeclarativeComponent * QDeclarativeWebView::newWindowComponent(void) const
+	?newWindowComponentChanged@QDeclarativeWebView@@IAEXXZ @ 1779 NONAME ABSENT ; void QDeclarativeWebView::newWindowComponentChanged(void)
+	?newWindowParent@QDeclarativeWebView@@QBEPAVQDeclarativeItem@@XZ @ 1780 NONAME ABSENT ; class QDeclarativeItem * QDeclarativeWebView::newWindowParent(void) const
+	?newWindowParentChanged@QDeclarativeWebView@@IAEXXZ @ 1781 NONAME ABSENT ; void QDeclarativeWebView::newWindowParentChanged(void)
+	?noteContentsSizeChanged@QDeclarativeWebView@@AAEXABVQSize@@@Z @ 1782 NONAME ABSENT ; void QDeclarativeWebView::noteContentsSizeChanged(class QSize const &)
 	?notifyOnServerStart@QDeclarativeDebugService@@SAXPAVQObject@@PBD@Z @ 1783 NONAME ; void QDeclarativeDebugService::notifyOnServerStart(class QObject *, char const *)
 	?notifyOnValueChanged@QDeclarativeExpression@@QBE_NXZ @ 1784 NONAME ; bool QDeclarativeExpression::notifyOnValueChanged(void) const
 	?notifySignal@QMetaPropertyBuilder@@QBE?AVQMetaMethodBuilder@@XZ @ 1785 NONAME ; class QMetaMethodBuilder QMetaPropertyBuilder::notifySignal(void) const
-	?number@QDeclarativeNumberFormatter@@QBEMXZ @ 1786 NONAME ; float QDeclarativeNumberFormatter::number(void) const
+	?number@QDeclarativeNumberFormatter@@QBEMXZ @ 1786 NONAME ABSENT ; float QDeclarativeNumberFormatter::number(void) const
 	?object@QDeclarativeAnchorChanges@@QBEPAVQDeclarativeItem@@XZ @ 1787 NONAME ; class QDeclarativeItem * QDeclarativeAnchorChanges::object(void) const
 	?object@QDeclarativeBind@@QAEPAVQObject@@XZ @ 1788 NONAME ; class QObject * QDeclarativeBind::object(void)
 	?object@QDeclarativeDebugObjectQuery@@QBE?AVQDeclarativeDebugObjectReference@@XZ @ 1789 NONAME ; class QDeclarativeDebugObjectReference QDeclarativeDebugObjectQuery::object(void) const
@@ -1817,22 +1817,22 @@ EXPORTS
 	?overShootChanged@QDeclarativeFlickable@@IAEXXZ @ 1816 NONAME ; void QDeclarativeFlickable::overShootChanged(void)
 	?override@QDeclarativeAnchorChanges@@UAE_NPAVQDeclarativeActionEvent@@@Z @ 1817 NONAME ; bool QDeclarativeAnchorChanges::override(class QDeclarativeActionEvent *)
 	?override@QDeclarativeParentChange@@UAE_NPAVQDeclarativeActionEvent@@@Z @ 1818 NONAME ; bool QDeclarativeParentChange::override(class QDeclarativeActionEvent *)
-	?pace@QDeclarativeParticleMotionWander@@QBEMXZ @ 1819 NONAME ; float QDeclarativeParticleMotionWander::pace(void) const
-	?paceChanged@QDeclarativeParticleMotionWander@@IAEXXZ @ 1820 NONAME ; void QDeclarativeParticleMotionWander::paceChanged(void)
+	?pace@QDeclarativeParticleMotionWander@@QBEMXZ @ 1819 NONAME ABSENT ; float QDeclarativeParticleMotionWander::pace(void) const
+	?paceChanged@QDeclarativeParticleMotionWander@@IAEXXZ @ 1820 NONAME ABSENT ; void QDeclarativeParticleMotionWander::paceChanged(void)
 	?packetWritten@QPacketProtocol@@IAEXXZ @ 1821 NONAME ; void QPacketProtocol::packetWritten(void)
 	?packetsAvailable@QPacketProtocol@@QBE_JXZ @ 1822 NONAME ; long long QPacketProtocol::packetsAvailable(void) const
-	?page@QDeclarativeWebView@@QBEPAVQWebPage@@XZ @ 1823 NONAME ; class QWebPage * QDeclarativeWebView::page(void) const
+	?page@QDeclarativeWebView@@QBEPAVQWebPage@@XZ @ 1823 NONAME ABSENT ; class QWebPage * QDeclarativeWebView::page(void) const
 	?pageChanged@QDeclarativeFlickable@@IAEXXZ @ 1824 NONAME ; void QDeclarativeFlickable::pageChanged(void)
-	?pageUrlChanged@QDeclarativeWebView@@AAEXXZ @ 1825 NONAME ; void QDeclarativeWebView::pageUrlChanged(void)
+	?pageUrlChanged@QDeclarativeWebView@@AAEXXZ @ 1825 NONAME ABSENT ; void QDeclarativeWebView::pageUrlChanged(void)
 	?paint@QDeclarativeBorderImage@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 1826 NONAME ; void QDeclarativeBorderImage::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
 	?paint@QDeclarativeImage@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 1827 NONAME ; void QDeclarativeImage::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
 	?paint@QDeclarativeItem@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 1828 NONAME ; void QDeclarativeItem::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
 	?paint@QDeclarativePaintedItem@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 1829 NONAME ; void QDeclarativePaintedItem::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
-	?paint@QDeclarativeParticles@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 1830 NONAME ; void QDeclarativeParticles::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
+	?paint@QDeclarativeParticles@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 1830 NONAME ABSENT ; void QDeclarativeParticles::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
 	?paint@QDeclarativeRectangle@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 1831 NONAME ; void QDeclarativeRectangle::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
 	?paint@QDeclarativeText@@UAEXPAVQPainter@@PBVQStyleOptionGraphicsItem@@PAVQWidget@@@Z @ 1832 NONAME ; void QDeclarativeText::paint(class QPainter *, class QStyleOptionGraphicsItem const *, class QWidget *)
 	?paintEvent@QDeclarativeView@@MAEXPAVQPaintEvent@@@Z @ 1833 NONAME ; void QDeclarativeView::paintEvent(class QPaintEvent *)
-	?paintPage@QDeclarativeWebView@@AAEXABVQRect@@@Z @ 1834 NONAME ; void QDeclarativeWebView::paintPage(class QRect const &)
+	?paintPage@QDeclarativeWebView@@AAEXABVQRect@@@Z @ 1834 NONAME ABSENT ; void QDeclarativeWebView::paintPage(class QRect const &)
 	?paintedGeometryChanged@QDeclarativeImage@@IAEXXZ @ 1835 NONAME ; void QDeclarativeImage::paintedGeometryChanged(void)
 	?paintedHeight@QDeclarativeImage@@QBEMXZ @ 1836 NONAME ; float QDeclarativeImage::paintedHeight(void) const
 	?paintedWidth@QDeclarativeImage@@QBEMXZ @ 1837 NONAME ; float QDeclarativeImage::paintedWidth(void) const
@@ -1840,7 +1840,7 @@ EXPORTS
 	?parameterNames@QMetaMethodBuilder@@QBE?AV?$QList@VQByteArray@@@@XZ @ 1839 NONAME ; class QList<class QByteArray> QMetaMethodBuilder::parameterNames(void) const
 	?parent@QDeclarativeOpenMetaObject@@IBEPAUQAbstractDynamicMetaObject@@XZ @ 1840 NONAME ; struct QAbstractDynamicMetaObject * QDeclarativeOpenMetaObject::parent(void) const
 	?parent@QDeclarativeParentChange@@QBEPAVQDeclarativeItem@@XZ @ 1841 NONAME ; class QDeclarativeItem * QDeclarativeParentChange::parent(void) const
-	?parentChanged@QDeclarativeItem@@IAEXXZ @ 1842 NONAME ; void QDeclarativeItem::parentChanged(void)
+	?parentChanged@QDeclarativeItem@@IAEXXZ @ 1842 NONAME ABSENT ; void QDeclarativeItem::parentChanged(void)
 	?parentContext@QDeclarativeContext@@QBEPAV1@XZ @ 1843 NONAME ; class QDeclarativeContext * QDeclarativeContext::parentContext(void) const
 	?parentItem@QDeclarativeItem@@QBEPAV1@XZ @ 1844 NONAME ; class QDeclarativeItem * QDeclarativeItem::parentItem(void) const
 	?parse@QDeclarativeStyledText@@SAXABVQString@@AAVQTextLayout@@@Z @ 1845 NONAME ; void QDeclarativeStyledText::parse(class QString const &, class QTextLayout &)
@@ -1849,7 +1849,7 @@ EXPORTS
 	?parts@QDeclarativeVisualDataModel@@QAEPAVQObject@@XZ @ 1848 NONAME ; class QObject * QDeclarativeVisualDataModel::parts(void)
 	?path@QDeclarativePath@@QBE?AVQPainterPath@@XZ @ 1849 NONAME ; class QPainterPath QDeclarativePath::path(void) const
 	?path@QDeclarativePathView@@QBEPAVQDeclarativePath@@XZ @ 1850 NONAME ; class QDeclarativePath * QDeclarativePathView::path(void) const
-	?pathElements@QDeclarativePath@@QAE?AU?$QDeclarativeListProperty@VQDeclarativePathElement@@@@XZ @ 1851 NONAME ; struct QDeclarativeListProperty<class QDeclarativePathElement> QDeclarativePath::pathElements(void)
+	?pathElements@QDeclarativePath@@QAE?AU?$QDeclarativeListProperty@VQDeclarativePathElement@@@@XZ @ 1851 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativePathElement> QDeclarativePath::pathElements(void)
 	?pathItemCount@QDeclarativePathView@@QBEHXZ @ 1852 NONAME ; int QDeclarativePathView::pathItemCount(void) const
 	?pausedChanged@QDeclarativeAnimatedImage@@IAEXXZ @ 1853 NONAME ; void QDeclarativeAnimatedImage::pausedChanged(void)
 	?penChanged@QDeclarativePen@@IAEXXZ @ 1854 NONAME ; void QDeclarativePen::penChanged(void)
@@ -1858,7 +1858,7 @@ EXPORTS
 	?persistentSelectionChanged@QDeclarativeTextEdit@@IAEX_N@Z @ 1857 NONAME ; void QDeclarativeTextEdit::persistentSelectionChanged(bool)
 	?pixelCacheSize@QDeclarativePaintedItem@@QBEHXZ @ 1858 NONAME ; int QDeclarativePaintedItem::pixelCacheSize(void) const
 	?pixmap@QDeclarativeImage@@QBE?AVQPixmap@@XZ @ 1859 NONAME ; class QPixmap QDeclarativeImage::pixmap(void) const
-	?pixmapChanged@QDeclarativeImageBase@@IAEXXZ @ 1860 NONAME ; void QDeclarativeImageBase::pixmapChanged(void)
+	?pixmapChanged@QDeclarativeImageBase@@IAEXXZ @ 1860 NONAME ABSENT ; void QDeclarativeImageBase::pixmapChanged(void)
 	?pixmapUrl@QDeclarativeGridScaledImage@@QBE?AVQString@@XZ @ 1861 NONAME ; class QString QDeclarativeGridScaledImage::pixmapUrl(void) const
 	?playingChanged@QDeclarativeAnimatedImage@@IAEXXZ @ 1862 NONAME ; void QDeclarativeAnimatedImage::playingChanged(void)
 	?playingStatusChanged@QDeclarativeAnimatedImage@@AAEXXZ @ 1863 NONAME ; void QDeclarativeAnimatedImage::playingStatusChanged(void)
@@ -1871,23 +1871,23 @@ EXPORTS
 	?position@QDeclarativeDomValue@@QBEHXZ @ 1870 NONAME ; int QDeclarativeDomValue::position(void) const
 	?position@QDeclarativeGradientStop@@QBEMXZ @ 1871 NONAME ; float QDeclarativeGradientStop::position(void) const
 	?positionChanged@QDeclarativeMouseArea@@IAEXPAVQDeclarativeMouseEvent@@@Z @ 1872 NONAME ; void QDeclarativeMouseArea::positionChanged(class QDeclarativeMouseEvent *)
-	?positionViewAtIndex@QDeclarativeGridView@@QAEXH@Z @ 1873 NONAME ; void QDeclarativeGridView::positionViewAtIndex(int)
-	?positionViewAtIndex@QDeclarativeListView@@QAEXH@Z @ 1874 NONAME ; void QDeclarativeListView::positionViewAtIndex(int)
+	?positionViewAtIndex@QDeclarativeGridView@@QAEXH@Z @ 1873 NONAME ABSENT ; void QDeclarativeGridView::positionViewAtIndex(int)
+	?positionViewAtIndex@QDeclarativeListView@@QAEXH@Z @ 1874 NONAME ABSENT ; void QDeclarativeListView::positionViewAtIndex(int)
 	?positionX@QDeclarativeBasePositioner@@IAEXHABUPositionedItem@1@@Z @ 1875 NONAME ; void QDeclarativeBasePositioner::positionX(int, struct QDeclarativeBasePositioner::PositionedItem const &)
 	?positionY@QDeclarativeBasePositioner@@IAEXHABUPositionedItem@1@@Z @ 1876 NONAME ; void QDeclarativeBasePositioner::positionY(int, struct QDeclarativeBasePositioner::PositionedItem const &)
 	?prePositioning@QDeclarativeBasePositioner@@IAEXXZ @ 1877 NONAME ; void QDeclarativeBasePositioner::prePositioning(void)
-	?preferredHeight@QDeclarativeWebView@@QBEHXZ @ 1878 NONAME ; int QDeclarativeWebView::preferredHeight(void) const
-	?preferredHeightChanged@QDeclarativeWebView@@IAEXXZ @ 1879 NONAME ; void QDeclarativeWebView::preferredHeightChanged(void)
+	?preferredHeight@QDeclarativeWebView@@QBEHXZ @ 1878 NONAME ABSENT ; int QDeclarativeWebView::preferredHeight(void) const
+	?preferredHeightChanged@QDeclarativeWebView@@IAEXXZ @ 1879 NONAME ABSENT ; void QDeclarativeWebView::preferredHeightChanged(void)
 	?preferredHighlightBegin@QDeclarativeListView@@QBEMXZ @ 1880 NONAME ; float QDeclarativeListView::preferredHighlightBegin(void) const
 	?preferredHighlightEnd@QDeclarativeListView@@QBEMXZ @ 1881 NONAME ; float QDeclarativeListView::preferredHighlightEnd(void) const
-	?preferredWidth@QDeclarativeWebView@@QBEHXZ @ 1882 NONAME ; int QDeclarativeWebView::preferredWidth(void) const
-	?preferredWidthChanged@QDeclarativeWebView@@IAEXXZ @ 1883 NONAME ; void QDeclarativeWebView::preferredWidthChanged(void)
+	?preferredWidth@QDeclarativeWebView@@QBEHXZ @ 1882 NONAME ABSENT ; int QDeclarativeWebView::preferredWidth(void) const
+	?preferredWidthChanged@QDeclarativeWebView@@IAEXXZ @ 1883 NONAME ABSENT ; void QDeclarativeWebView::preferredWidthChanged(void)
 	?prepare@QDeclarativeTransition@@QAEXAAV?$QList@VQDeclarativeAction@@@@AAV?$QList@VQDeclarativeProperty@@@@PAVQDeclarativeTransitionManager@@@Z @ 1884 NONAME ; void QDeclarativeTransition::prepare(class QList<class QDeclarativeAction> &, class QList<class QDeclarativeProperty> &, class QDeclarativeTransitionManager *)
 	?pressAndHold@QDeclarativeMouseArea@@IAEXPAVQDeclarativeMouseEvent@@@Z @ 1885 NONAME ; void QDeclarativeMouseArea::pressAndHold(class QDeclarativeMouseEvent *)
 	?pressDelay@QDeclarativeFlickable@@QBEHXZ @ 1886 NONAME ; int QDeclarativeFlickable::pressDelay(void) const
 	?pressDelayChanged@QDeclarativeFlickable@@IAEXXZ @ 1887 NONAME ; void QDeclarativeFlickable::pressDelayChanged(void)
-	?pressGrabTime@QDeclarativeWebView@@QBEHXZ @ 1888 NONAME ; int QDeclarativeWebView::pressGrabTime(void) const
-	?pressGrabTimeChanged@QDeclarativeWebView@@IAEXXZ @ 1889 NONAME ; void QDeclarativeWebView::pressGrabTimeChanged(void)
+	?pressGrabTime@QDeclarativeWebView@@QBEHXZ @ 1888 NONAME ABSENT ; int QDeclarativeWebView::pressGrabTime(void) const
+	?pressGrabTimeChanged@QDeclarativeWebView@@IAEXXZ @ 1889 NONAME ABSENT ; void QDeclarativeWebView::pressGrabTimeChanged(void)
 	?pressed@QDeclarativeMouseArea@@IAEXPAVQDeclarativeMouseEvent@@@Z @ 1890 NONAME ; void QDeclarativeMouseArea::pressed(class QDeclarativeMouseEvent *)
 	?pressed@QDeclarativeMouseArea@@QBE_NXZ @ 1891 NONAME ; bool QDeclarativeMouseArea::pressed(void) const
 	?pressedButtons@QDeclarativeMouseArea@@QBE?AV?$QFlags@W4MouseButton@Qt@@@@XZ @ 1892 NONAME ; class QFlags<enum Qt::MouseButton> QDeclarativeMouseArea::pressedButtons(void) const
@@ -1896,12 +1896,12 @@ EXPORTS
 	?progress@QDeclarativeComponent@@QBEMXZ @ 1895 NONAME ; float QDeclarativeComponent::progress(void) const
 	?progress@QDeclarativeImageBase@@QBEMXZ @ 1896 NONAME ; float QDeclarativeImageBase::progress(void) const
 	?progress@QDeclarativeLoader@@QBEMXZ @ 1897 NONAME ; float QDeclarativeLoader::progress(void) const
-	?progress@QDeclarativeWebView@@QBEMXZ @ 1898 NONAME ; float QDeclarativeWebView::progress(void) const
+	?progress@QDeclarativeWebView@@QBEMXZ @ 1898 NONAME ABSENT ; float QDeclarativeWebView::progress(void) const
 	?progress@QDeclarativeXmlListModel@@QBEMXZ @ 1899 NONAME ; float QDeclarativeXmlListModel::progress(void) const
 	?progressChanged@QDeclarativeComponent@@IAEXM@Z @ 1900 NONAME ; void QDeclarativeComponent::progressChanged(float)
 	?progressChanged@QDeclarativeImageBase@@IAEXM@Z @ 1901 NONAME ; void QDeclarativeImageBase::progressChanged(float)
 	?progressChanged@QDeclarativeLoader@@IAEXXZ @ 1902 NONAME ; void QDeclarativeLoader::progressChanged(void)
-	?progressChanged@QDeclarativeWebView@@IAEXXZ @ 1903 NONAME ; void QDeclarativeWebView::progressChanged(void)
+	?progressChanged@QDeclarativeWebView@@IAEXXZ @ 1903 NONAME ABSENT ; void QDeclarativeWebView::progressChanged(void)
 	?progressChanged@QDeclarativeXmlListModel@@IAEXM@Z @ 1904 NONAME ; void QDeclarativeXmlListModel::progressChanged(float)
 	?properties@QDeclarativeCustomParserNode@@QBE?AV?$QList@VQDeclarativeCustomParserProperty@@@@XZ @ 1905 NONAME ; class QList<class QDeclarativeCustomParserProperty> QDeclarativeCustomParserNode::properties(void) const
 	?properties@QDeclarativeDebugObjectReference@@QBE?AV?$QList@VQDeclarativeDebugPropertyReference@@@@XZ @ 1906 NONAME ; class QList<class QDeclarativeDebugPropertyReference> QDeclarativeDebugObjectReference::properties(void) const
@@ -1928,16 +1928,16 @@ EXPORTS
 	?propertyValueSourceCast@QDeclarativeType@@QBEHXZ @ 1927 NONAME ; int QDeclarativeType::propertyValueSourceCast(void) const
 	?propertyWrite@QDeclarativeOpenMetaObject@@MAEXH@Z @ 1928 NONAME ; void QDeclarativeOpenMetaObject::propertyWrite(int)
 	?qListTypeId@QDeclarativeType@@QBEHXZ @ 1929 NONAME ; int QDeclarativeType::qListTypeId(void) const
-	?q_func@QDeclarativeContextPrivate@@AAEPAVQDeclarativeContext@@XZ @ 1930 NONAME ; class QDeclarativeContext * QDeclarativeContextPrivate::q_func(void)
-	?q_func@QDeclarativeContextPrivate@@ABEPBVQDeclarativeContext@@XZ @ 1931 NONAME ; class QDeclarativeContext const * QDeclarativeContextPrivate::q_func(void) const
+	?q_func@QDeclarativeContextPrivate@@AAEPAVQDeclarativeContext@@XZ @ 1930 NONAME ABSENT ; class QDeclarativeContext * QDeclarativeContextPrivate::q_func(void)
+	?q_func@QDeclarativeContextPrivate@@ABEPBVQDeclarativeContext@@XZ @ 1931 NONAME ABSENT ; class QDeclarativeContext const * QDeclarativeContextPrivate::q_func(void) const
 	?q_textChanged@QDeclarativeTextEdit@@AAEXXZ @ 1932 NONAME ; void QDeclarativeTextEdit::q_textChanged(void)
 	?q_textChanged@QDeclarativeTextInput@@AAEXXZ @ 1933 NONAME ; void QDeclarativeTextInput::q_textChanged(void)
 	?qmlAttachedProperties@QDeclarativeComponent@@SAPAVQDeclarativeComponentAttached@@PAVQObject@@@Z @ 1934 NONAME ; class QDeclarativeComponentAttached * QDeclarativeComponent::qmlAttachedProperties(class QObject *)
 	?qmlAttachedProperties@QDeclarativeGridView@@SAPAVQDeclarativeGridViewAttached@@PAVQObject@@@Z @ 1935 NONAME ; class QDeclarativeGridViewAttached * QDeclarativeGridView::qmlAttachedProperties(class QObject *)
 	?qmlAttachedProperties@QDeclarativeListView@@SAPAVQDeclarativeListViewAttached@@PAVQObject@@@Z @ 1936 NONAME ; class QDeclarativeListViewAttached * QDeclarativeListView::qmlAttachedProperties(class QObject *)
-	?qmlAttachedProperties@QDeclarativePathView@@SAPAVQObject@@PAV2@@Z @ 1937 NONAME ; class QObject * QDeclarativePathView::qmlAttachedProperties(class QObject *)
+	?qmlAttachedProperties@QDeclarativePathView@@SAPAVQObject@@PAV2@@Z @ 1937 NONAME ABSENT ; class QObject * QDeclarativePathView::qmlAttachedProperties(class QObject *)
 	?qmlAttachedProperties@QDeclarativeVisualItemModel@@SAPAVQDeclarativeVisualItemModelAttached@@PAVQObject@@@Z @ 1938 NONAME ; class QDeclarativeVisualItemModelAttached * QDeclarativeVisualItemModel::qmlAttachedProperties(class QObject *)
-	?qmlAttachedProperties@QDeclarativeWebView@@SAPAVQDeclarativeWebViewAttached@@PAVQObject@@@Z @ 1939 NONAME ; class QDeclarativeWebViewAttached * QDeclarativeWebView::qmlAttachedProperties(class QObject *)
+	?qmlAttachedProperties@QDeclarativeWebView@@SAPAVQDeclarativeWebViewAttached@@PAVQObject@@@Z @ 1939 NONAME ABSENT ; class QDeclarativeWebViewAttached * QDeclarativeWebView::qmlAttachedProperties(class QObject *)
 	?qmlAttachedPropertiesObject@@YAPAVQObject@@PAHPBV1@PBUQMetaObject@@_N@Z @ 1940 NONAME ; class QObject * qmlAttachedPropertiesObject(int *, class QObject const *, struct QMetaObject const *, bool)
 	?qmlAttachedPropertiesObjectById@@YAPAVQObject@@HPBV1@_N@Z @ 1941 NONAME ; class QObject * qmlAttachedPropertiesObjectById(int, class QObject const *, bool)
 	?qmlContext@@YAPAVQDeclarativeContext@@PBVQObject@@@Z @ 1942 NONAME ; class QDeclarativeContext * qmlContext(class QObject const *)
@@ -1962,7 +1962,7 @@ EXPORTS
 	?qt_metacall@QDeclarativeConnections@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1961 NONAME ; int QDeclarativeConnections::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeContext@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1962 NONAME ; int QDeclarativeContext::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeCurve@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1963 NONAME ; int QDeclarativeCurve::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QDeclarativeDateTimeFormatter@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1964 NONAME ; int QDeclarativeDateTimeFormatter::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeDateTimeFormatter@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1964 NONAME ABSENT ; int QDeclarativeDateTimeFormatter::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeDebugClient@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1965 NONAME ; int QDeclarativeDebugClient::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeDebugConnection@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1966 NONAME ; int QDeclarativeDebugConnection::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeDebugEnginesQuery@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1967 NONAME ; int QDeclarativeDebugEnginesQuery::qt_metacall(enum QMetaObject::Call, int, void * *)
@@ -1975,7 +1975,7 @@ EXPORTS
 	?qt_metacall@QDeclarativeDebugService@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1974 NONAME ; int QDeclarativeDebugService::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeDebugWatch@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1975 NONAME ; int QDeclarativeDebugWatch::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeDrag@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1976 NONAME ; int QDeclarativeDrag::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QDeclarativeEaseFollow@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1977 NONAME ; int QDeclarativeEaseFollow::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeEaseFollow@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1977 NONAME ABSENT ; int QDeclarativeEaseFollow::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeEngine@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1978 NONAME ; int QDeclarativeEngine::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeEngineDebug@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1979 NONAME ; int QDeclarativeEngineDebug::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeExpression@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1980 NONAME ; int QDeclarativeExpression::qt_metacall(enum QMetaObject::Call, int, void * *)
@@ -1998,14 +1998,14 @@ EXPORTS
 	?qt_metacall@QDeclarativeListView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1997 NONAME ; int QDeclarativeListView::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeLoader@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1998 NONAME ; int QDeclarativeLoader::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeMouseArea@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1999 NONAME ; int QDeclarativeMouseArea::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QDeclarativeNumberFormatter@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2000 NONAME ; int QDeclarativeNumberFormatter::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeNumberFormatter@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2000 NONAME ABSENT ; int QDeclarativeNumberFormatter::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativePaintedItem@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2001 NONAME ; int QDeclarativePaintedItem::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeParentChange@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2002 NONAME ; int QDeclarativeParentChange::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QDeclarativeParticleMotion@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2003 NONAME ; int QDeclarativeParticleMotion::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QDeclarativeParticleMotionGravity@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2004 NONAME ; int QDeclarativeParticleMotionGravity::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QDeclarativeParticleMotionLinear@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2005 NONAME ; int QDeclarativeParticleMotionLinear::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QDeclarativeParticleMotionWander@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2006 NONAME ; int QDeclarativeParticleMotionWander::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QDeclarativeParticles@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2007 NONAME ; int QDeclarativeParticles::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeParticleMotion@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2003 NONAME ABSENT ; int QDeclarativeParticleMotion::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeParticleMotionGravity@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2004 NONAME ABSENT ; int QDeclarativeParticleMotionGravity::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeParticleMotionLinear@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2005 NONAME ABSENT ; int QDeclarativeParticleMotionLinear::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeParticleMotionWander@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2006 NONAME ABSENT ; int QDeclarativeParticleMotionWander::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeParticles@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2007 NONAME ABSENT ; int QDeclarativeParticles::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativePath@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2008 NONAME ; int QDeclarativePath::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativePathAttribute@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2009 NONAME ; int QDeclarativePathAttribute::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativePathCubic@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2010 NONAME ; int QDeclarativePathCubic::qt_metacall(enum QMetaObject::Call, int, void * *)
@@ -2039,8 +2039,8 @@ EXPORTS
 	?qt_metacall@QDeclarativeVisualDataModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2038 NONAME ; int QDeclarativeVisualDataModel::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeVisualItemModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2039 NONAME ; int QDeclarativeVisualItemModel::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeVisualModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2040 NONAME ; int QDeclarativeVisualModel::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QDeclarativeWebPage@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2041 NONAME ; int QDeclarativeWebPage::qt_metacall(enum QMetaObject::Call, int, void * *)
-	?qt_metacall@QDeclarativeWebView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2042 NONAME ; int QDeclarativeWebView::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeWebPage@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2041 NONAME ABSENT ; int QDeclarativeWebPage::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeWebView@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2042 NONAME ABSENT ; int QDeclarativeWebView::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeXmlListModel@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2043 NONAME ; int QDeclarativeXmlListModel::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QDeclarativeXmlListModelRole@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2044 NONAME ; int QDeclarativeXmlListModelRole::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QListModelInterface@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 2045 NONAME ; int QListModelInterface::qt_metacall(enum QMetaObject::Call, int, void * *)
@@ -2057,7 +2057,7 @@ EXPORTS
 	?qt_metacast@QDeclarativeConnections@@UAEPAXPBD@Z @ 2056 NONAME ; void * QDeclarativeConnections::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeContext@@UAEPAXPBD@Z @ 2057 NONAME ; void * QDeclarativeContext::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeCurve@@UAEPAXPBD@Z @ 2058 NONAME ; void * QDeclarativeCurve::qt_metacast(char const *)
-	?qt_metacast@QDeclarativeDateTimeFormatter@@UAEPAXPBD@Z @ 2059 NONAME ; void * QDeclarativeDateTimeFormatter::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeDateTimeFormatter@@UAEPAXPBD@Z @ 2059 NONAME ABSENT ; void * QDeclarativeDateTimeFormatter::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeDebugClient@@UAEPAXPBD@Z @ 2060 NONAME ; void * QDeclarativeDebugClient::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeDebugConnection@@UAEPAXPBD@Z @ 2061 NONAME ; void * QDeclarativeDebugConnection::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeDebugEnginesQuery@@UAEPAXPBD@Z @ 2062 NONAME ; void * QDeclarativeDebugEnginesQuery::qt_metacast(char const *)
@@ -2070,7 +2070,7 @@ EXPORTS
 	?qt_metacast@QDeclarativeDebugService@@UAEPAXPBD@Z @ 2069 NONAME ; void * QDeclarativeDebugService::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeDebugWatch@@UAEPAXPBD@Z @ 2070 NONAME ; void * QDeclarativeDebugWatch::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeDrag@@UAEPAXPBD@Z @ 2071 NONAME ; void * QDeclarativeDrag::qt_metacast(char const *)
-	?qt_metacast@QDeclarativeEaseFollow@@UAEPAXPBD@Z @ 2072 NONAME ; void * QDeclarativeEaseFollow::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeEaseFollow@@UAEPAXPBD@Z @ 2072 NONAME ABSENT ; void * QDeclarativeEaseFollow::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeEngine@@UAEPAXPBD@Z @ 2073 NONAME ; void * QDeclarativeEngine::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeEngineDebug@@UAEPAXPBD@Z @ 2074 NONAME ; void * QDeclarativeEngineDebug::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeExpression@@UAEPAXPBD@Z @ 2075 NONAME ; void * QDeclarativeExpression::qt_metacast(char const *)
@@ -2093,14 +2093,14 @@ EXPORTS
 	?qt_metacast@QDeclarativeListView@@UAEPAXPBD@Z @ 2092 NONAME ; void * QDeclarativeListView::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeLoader@@UAEPAXPBD@Z @ 2093 NONAME ; void * QDeclarativeLoader::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeMouseArea@@UAEPAXPBD@Z @ 2094 NONAME ; void * QDeclarativeMouseArea::qt_metacast(char const *)
-	?qt_metacast@QDeclarativeNumberFormatter@@UAEPAXPBD@Z @ 2095 NONAME ; void * QDeclarativeNumberFormatter::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeNumberFormatter@@UAEPAXPBD@Z @ 2095 NONAME ABSENT ; void * QDeclarativeNumberFormatter::qt_metacast(char const *)
 	?qt_metacast@QDeclarativePaintedItem@@UAEPAXPBD@Z @ 2096 NONAME ; void * QDeclarativePaintedItem::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeParentChange@@UAEPAXPBD@Z @ 2097 NONAME ; void * QDeclarativeParentChange::qt_metacast(char const *)
-	?qt_metacast@QDeclarativeParticleMotion@@UAEPAXPBD@Z @ 2098 NONAME ; void * QDeclarativeParticleMotion::qt_metacast(char const *)
-	?qt_metacast@QDeclarativeParticleMotionGravity@@UAEPAXPBD@Z @ 2099 NONAME ; void * QDeclarativeParticleMotionGravity::qt_metacast(char const *)
-	?qt_metacast@QDeclarativeParticleMotionLinear@@UAEPAXPBD@Z @ 2100 NONAME ; void * QDeclarativeParticleMotionLinear::qt_metacast(char const *)
-	?qt_metacast@QDeclarativeParticleMotionWander@@UAEPAXPBD@Z @ 2101 NONAME ; void * QDeclarativeParticleMotionWander::qt_metacast(char const *)
-	?qt_metacast@QDeclarativeParticles@@UAEPAXPBD@Z @ 2102 NONAME ; void * QDeclarativeParticles::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeParticleMotion@@UAEPAXPBD@Z @ 2098 NONAME ABSENT ; void * QDeclarativeParticleMotion::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeParticleMotionGravity@@UAEPAXPBD@Z @ 2099 NONAME ABSENT ; void * QDeclarativeParticleMotionGravity::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeParticleMotionLinear@@UAEPAXPBD@Z @ 2100 NONAME ABSENT ; void * QDeclarativeParticleMotionLinear::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeParticleMotionWander@@UAEPAXPBD@Z @ 2101 NONAME ABSENT ; void * QDeclarativeParticleMotionWander::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeParticles@@UAEPAXPBD@Z @ 2102 NONAME ABSENT ; void * QDeclarativeParticles::qt_metacast(char const *)
 	?qt_metacast@QDeclarativePath@@UAEPAXPBD@Z @ 2103 NONAME ; void * QDeclarativePath::qt_metacast(char const *)
 	?qt_metacast@QDeclarativePathAttribute@@UAEPAXPBD@Z @ 2104 NONAME ; void * QDeclarativePathAttribute::qt_metacast(char const *)
 	?qt_metacast@QDeclarativePathCubic@@UAEPAXPBD@Z @ 2105 NONAME ; void * QDeclarativePathCubic::qt_metacast(char const *)
@@ -2134,8 +2134,8 @@ EXPORTS
 	?qt_metacast@QDeclarativeVisualDataModel@@UAEPAXPBD@Z @ 2133 NONAME ; void * QDeclarativeVisualDataModel::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeVisualItemModel@@UAEPAXPBD@Z @ 2134 NONAME ; void * QDeclarativeVisualItemModel::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeVisualModel@@UAEPAXPBD@Z @ 2135 NONAME ; void * QDeclarativeVisualModel::qt_metacast(char const *)
-	?qt_metacast@QDeclarativeWebPage@@UAEPAXPBD@Z @ 2136 NONAME ; void * QDeclarativeWebPage::qt_metacast(char const *)
-	?qt_metacast@QDeclarativeWebView@@UAEPAXPBD@Z @ 2137 NONAME ; void * QDeclarativeWebView::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeWebPage@@UAEPAXPBD@Z @ 2136 NONAME ABSENT ; void * QDeclarativeWebPage::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeWebView@@UAEPAXPBD@Z @ 2137 NONAME ABSENT ; void * QDeclarativeWebView::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeXmlListModel@@UAEPAXPBD@Z @ 2138 NONAME ; void * QDeclarativeXmlListModel::qt_metacast(char const *)
 	?qt_metacast@QDeclarativeXmlListModelRole@@UAEPAXPBD@Z @ 2139 NONAME ; void * QDeclarativeXmlListModelRole::qt_metacast(char const *)
 	?qt_metacast@QListModelInterface@@UAEPAXPBD@Z @ 2140 NONAME ; void * QListModelInterface::qt_metacast(char const *)
@@ -2144,7 +2144,7 @@ EXPORTS
 	?query@QDeclarativeXmlListModel@@QBE?AVQString@@XZ @ 2143 NONAME ; class QString QDeclarativeXmlListModel::query(void) const
 	?query@QDeclarativeXmlListModelRole@@QBE?AVQString@@XZ @ 2144 NONAME ; class QString QDeclarativeXmlListModelRole::query(void) const
 	?queryAvailableEngines@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugEnginesQuery@@PAVQObject@@@Z @ 2145 NONAME ; class QDeclarativeDebugEnginesQuery * QDeclarativeEngineDebug::queryAvailableEngines(class QObject *)
-	?queryCompleted@QDeclarativeXmlListModel@@AAEXHH@Z @ 2146 NONAME ; void QDeclarativeXmlListModel::queryCompleted(int, int)
+	?queryCompleted@QDeclarativeXmlListModel@@AAEXHH@Z @ 2146 NONAME ABSENT ; void QDeclarativeXmlListModel::queryCompleted(int, int)
 	?queryExpressionResult@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugExpressionQuery@@HABVQString@@PAVQObject@@@Z @ 2147 NONAME ; class QDeclarativeDebugExpressionQuery * QDeclarativeEngineDebug::queryExpressionResult(int, class QString const &, class QObject *)
 	?queryId@QDeclarativeDebugWatch@@QBEHXZ @ 2148 NONAME ; int QDeclarativeDebugWatch::queryId(void) const
 	?queryObject@QDeclarativeEngineDebug@@QAEPAVQDeclarativeDebugObjectQuery@@ABVQDeclarativeDebugObjectReference@@PAVQObject@@@Z @ 2149 NONAME ; class QDeclarativeDebugObjectQuery * QDeclarativeEngineDebug::queryObject(class QDeclarativeDebugObjectReference const &, class QObject *)
@@ -2165,7 +2165,7 @@ EXPORTS
 	?refill@QDeclarativeGridView@@AAEXXZ @ 2164 NONAME ; void QDeclarativeGridView::refill(void)
 	?refill@QDeclarativeListView@@AAEXXZ @ 2165 NONAME ; void QDeclarativeListView::refill(void)
 	?refill@QDeclarativePathView@@AAEXXZ @ 2166 NONAME ; void QDeclarativePathView::refill(void)
-	?refreshExpressions@QDeclarativeContextPrivate@@QAEXXZ @ 2167 NONAME ; void QDeclarativeContextPrivate::refreshExpressions(void)
+	?refreshExpressions@QDeclarativeContextPrivate@@QAEXXZ @ 2167 NONAME ABSENT ; void QDeclarativeContextPrivate::refreshExpressions(void)
 	?regenerate@QDeclarativeRepeater@@AAEXXZ @ 2168 NONAME ; void QDeclarativeRepeater::regenerate(void)
 	?registerCustomStringConverter@QDeclarativeMetaType@@SAXHP6A?AVQVariant@@ABVQString@@@Z@Z @ 2169 NONAME ; void QDeclarativeMetaType::registerCustomStringConverter(int, class QVariant (*)(class QString const &))
 	?registerType@QDeclarativePrivate@@YAHABURegisterInterface@1@@Z @ 2170 NONAME ; int QDeclarativePrivate::registerType(struct QDeclarativePrivate::RegisterInterface const &)
@@ -2177,7 +2177,7 @@ EXPORTS
 	?release@QDeclarativeVisualItemModel@@UAE?AV?$QFlags@W4ReleaseFlag@QDeclarativeVisualModel@@@@PAVQDeclarativeItem@@@Z @ 2176 NONAME ; class QFlags<enum QDeclarativeVisualModel::ReleaseFlag> QDeclarativeVisualItemModel::release(class QDeclarativeItem *)
 	?released@QDeclarativeMouseArea@@IAEXPAVQDeclarativeMouseEvent@@@Z @ 2177 NONAME ; void QDeclarativeMouseArea::released(class QDeclarativeMouseEvent *)
 	?reload@QDeclarativeXmlListModel@@QAEXXZ @ 2178 NONAME ; void QDeclarativeXmlListModel::reload(void)
-	?reloadAction@QDeclarativeWebView@@QBEPAVQAction@@XZ @ 2179 NONAME ; class QAction * QDeclarativeWebView::reloadAction(void) const
+	?reloadAction@QDeclarativeWebView@@QBEPAVQAction@@XZ @ 2179 NONAME ABSENT ; class QAction * QDeclarativeWebView::reloadAction(void) const
 	?remove@QDeclarativeListModel@@QAEXH@Z @ 2180 NONAME ; void QDeclarativeListModel::remove(int)
 	?removeClassInfo@QMetaObjectBuilder@@QAEXH@Z @ 2181 NONAME ; void QMetaObjectBuilder::removeClassInfo(int)
 	?removeConstructor@QMetaObjectBuilder@@QAEXH@Z @ 2182 NONAME ; void QMetaObjectBuilder::removeConstructor(int)
@@ -2190,16 +2190,16 @@ EXPORTS
 	?removeRelatedMetaObject@QMetaObjectBuilder@@QAEXH@Z @ 2189 NONAME ; void QMetaObjectBuilder::removeRelatedMetaObject(int)
 	?removeState@QDeclarativeStateGroup@@AAEXPAVQDeclarativeState@@@Z @ 2190 NONAME ; void QDeclarativeStateGroup::removeState(class QDeclarativeState *)
 	?removeWatch@QDeclarativeEngineDebug@@QAEXPAVQDeclarativeDebugWatch@@@Z @ 2191 NONAME ; void QDeclarativeEngineDebug::removeWatch(class QDeclarativeDebugWatch *)
-	?renderingEnabled@QDeclarativeWebView@@QBE_NXZ @ 2192 NONAME ; bool QDeclarativeWebView::renderingEnabled(void) const
-	?renderingEnabledChanged@QDeclarativeWebView@@IAEXXZ @ 2193 NONAME ; void QDeclarativeWebView::renderingEnabledChanged(void)
+	?renderingEnabled@QDeclarativeWebView@@QBE_NXZ @ 2192 NONAME ABSENT ; bool QDeclarativeWebView::renderingEnabled(void) const
+	?renderingEnabledChanged@QDeclarativeWebView@@IAEXXZ @ 2193 NONAME ABSENT ; void QDeclarativeWebView::renderingEnabledChanged(void)
 	?replyFinished@QDeclarativeFontLoader@@AAEXXZ @ 2194 NONAME ; void QDeclarativeFontLoader::replyFinished(void)
-	?request@QDeclarativePixmapCache@@SAPAVQDeclarativePixmapReply@@PAVQDeclarativeEngine@@ABVQUrl@@@Z @ 2195 NONAME ; class QDeclarativePixmapReply * QDeclarativePixmapCache::request(class QDeclarativeEngine *, class QUrl const &)
+	?request@QDeclarativePixmapCache@@SAPAVQDeclarativePixmapReply@@PAVQDeclarativeEngine@@ABVQUrl@@@Z @ 2195 NONAME ABSENT ; class QDeclarativePixmapReply * QDeclarativePixmapCache::request(class QDeclarativeEngine *, class QUrl const &)
 	?requestFinished@QDeclarativeBorderImage@@EAEXXZ @ 2196 NONAME ; void QDeclarativeBorderImage::requestFinished(void)
 	?requestFinished@QDeclarativeImageBase@@EAEXXZ @ 2197 NONAME ; void QDeclarativeImageBase::requestFinished(void)
 	?requestFinished@QDeclarativeXmlListModel@@AAEXXZ @ 2198 NONAME ; void QDeclarativeXmlListModel::requestFinished(void)
 	?requestProgress@QDeclarativeImageBase@@AAEX_J0@Z @ 2199 NONAME ; void QDeclarativeImageBase::requestProgress(long long, long long)
 	?requestProgress@QDeclarativeXmlListModel@@AAEX_J0@Z @ 2200 NONAME ; void QDeclarativeXmlListModel::requestProgress(long long, long long)
-	?reset@QDeclarativeAnchorChanges@@QBE?AVQString@@XZ @ 2201 NONAME ; class QString QDeclarativeAnchorChanges::reset(void) const
+	?reset@QDeclarativeAnchorChanges@@QBE?AVQString@@XZ @ 2201 NONAME ABSENT ; class QString QDeclarativeAnchorChanges::reset(void) const
 	?reset@QDeclarativeCompiler@@CAXPAVQDeclarativeCompiledData@@@Z @ 2202 NONAME ; void QDeclarativeCompiler::reset(class QDeclarativeCompiledData *)
 	?reset@QDeclarativeProperty@@QBE_NXZ @ 2203 NONAME ; bool QDeclarativeProperty::reset(void) const
 	?resetBaseline@QDeclarativeAnchors@@QAEXXZ @ 2204 NONAME ; void QDeclarativeAnchors::resetBaseline(void)
@@ -2218,7 +2218,7 @@ EXPORTS
 	?resizeMode@QDeclarativeView@@QBE?AW4ResizeMode@1@XZ @ 2217 NONAME ; enum QDeclarativeView::ResizeMode QDeclarativeView::resizeMode(void) const
 	?resizeModeChanged@QDeclarativeLoader@@IAEXXZ @ 2218 NONAME ; void QDeclarativeLoader::resizeModeChanged(void)
 	?resolvedUrl@QDeclarativeContext@@QAE?AVQUrl@@ABV2@@Z @ 2219 NONAME ; class QUrl QDeclarativeContext::resolvedUrl(class QUrl const &)
-	?resources@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQObject@@@@XZ @ 2220 NONAME ; struct QDeclarativeListProperty<class QObject> QDeclarativeItem::resources(void)
+	?resources@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQObject@@@@XZ @ 2220 NONAME ABSENT ; struct QDeclarativeListProperty<class QObject> QDeclarativeItem::resources(void)
 	?restart@QDeclarativeTimer@@QAEXXZ @ 2221 NONAME ; void QDeclarativeTimer::restart(void)
 	?restoreEntryValues@QDeclarativePropertyChanges@@QBE_NXZ @ 2222 NONAME ; bool QDeclarativePropertyChanges::restoreEntryValues(void) const
 	?result@QDeclarativeDebugExpressionQuery@@QBE?AVQVariant@@XZ @ 2223 NONAME ; class QVariant QDeclarativeDebugExpressionQuery::result(void) const
@@ -2226,18 +2226,18 @@ EXPORTS
 	?reverse@QDeclarativeAnchorChanges@@UAEXXZ @ 2225 NONAME ; void QDeclarativeAnchorChanges::reverse(void)
 	?reverse@QDeclarativeParentChange@@UAEXXZ @ 2226 NONAME ; void QDeclarativeParentChange::reverse(void)
 	?reversible@QDeclarativeTransition@@QBE_NXZ @ 2227 NONAME ; bool QDeclarativeTransition::reversible(void) const
-	?reversingMode@QDeclarativeEaseFollow@@QBE?AW4ReversingMode@1@XZ @ 2228 NONAME ; enum QDeclarativeEaseFollow::ReversingMode QDeclarativeEaseFollow::reversingMode(void) const
-	?reversingModeChanged@QDeclarativeEaseFollow@@IAEXXZ @ 2229 NONAME ; void QDeclarativeEaseFollow::reversingModeChanged(void)
+	?reversingMode@QDeclarativeEaseFollow@@QBE?AW4ReversingMode@1@XZ @ 2228 NONAME ABSENT ; enum QDeclarativeEaseFollow::ReversingMode QDeclarativeEaseFollow::reversingMode(void) const
+	?reversingModeChanged@QDeclarativeEaseFollow@@IAEXXZ @ 2229 NONAME ABSENT ; void QDeclarativeEaseFollow::reversingModeChanged(void)
 	?rewind@QDeclarativeAnchorChanges@@UAEXXZ @ 2230 NONAME ; void QDeclarativeAnchorChanges::rewind(void)
 	?rewind@QDeclarativeParentChange@@UAEXXZ @ 2231 NONAME ; void QDeclarativeParentChange::rewind(void)
-	?right@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2232 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::right(void) const
-	?right@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2233 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchors::right(void) const
-	?right@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2234 NONAME ; class QDeclarativeAnchorLine QDeclarativeItem::right(void) const
+	?right@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2232 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::right(void) const
+	?right@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2233 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchors::right(void) const
+	?right@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2234 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeItem::right(void) const
 	?right@QDeclarativeScaleGrid@@QBEHXZ @ 2235 NONAME ; int QDeclarativeScaleGrid::right(void) const
 	?rightChanged@QDeclarativeAnchors@@IAEXXZ @ 2236 NONAME ; void QDeclarativeAnchors::rightChanged(void)
 	?rightMargin@QDeclarativeAnchors@@QBEMXZ @ 2237 NONAME ; float QDeclarativeAnchors::rightMargin(void) const
 	?rightMarginChanged@QDeclarativeAnchors@@IAEXXZ @ 2238 NONAME ; void QDeclarativeAnchors::rightMarginChanged(void)
-	?roleObjects@QDeclarativeXmlListModel@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeXmlListModelRole@@@@XZ @ 2239 NONAME ; struct QDeclarativeListProperty<class QDeclarativeXmlListModelRole> QDeclarativeXmlListModel::roleObjects(void)
+	?roleObjects@QDeclarativeXmlListModel@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeXmlListModelRole@@@@XZ @ 2239 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativeXmlListModelRole> QDeclarativeXmlListModel::roleObjects(void)
 	?roles@QDeclarativeListModel@@UBE?AV?$QList@H@@XZ @ 2240 NONAME ; class QList<int> QDeclarativeListModel::roles(void) const
 	?roles@QDeclarativeXmlListModel@@UBE?AV?$QList@H@@XZ @ 2241 NONAME ; class QList<int> QDeclarativeXmlListModel::roles(void) const
 	?rootContext@QDeclarativeDebugRootContextQuery@@QBE?AVQDeclarativeDebugContextReference@@XZ @ 2242 NONAME ; class QDeclarativeDebugContextReference QDeclarativeDebugRootContextQuery::rootContext(void) const
@@ -2262,11 +2262,11 @@ EXPORTS
 	?sceneEvent@QDeclarativeFocusPanel@@MAE_NPAVQEvent@@@Z @ 2261 NONAME ; bool QDeclarativeFocusPanel::sceneEvent(class QEvent *)
 	?sceneEvent@QDeclarativeItem@@MAE_NPAVQEvent@@@Z @ 2262 NONAME ; bool QDeclarativeItem::sceneEvent(class QEvent *)
 	?sceneEvent@QDeclarativeMouseArea@@MAE_NPAVQEvent@@@Z @ 2263 NONAME ; bool QDeclarativeMouseArea::sceneEvent(class QEvent *)
-	?sceneEvent@QDeclarativeWebView@@MAE_NPAVQEvent@@@Z @ 2264 NONAME ; bool QDeclarativeWebView::sceneEvent(class QEvent *)
+	?sceneEvent@QDeclarativeWebView@@MAE_NPAVQEvent@@@Z @ 2264 NONAME ABSENT ; bool QDeclarativeWebView::sceneEvent(class QEvent *)
 	?sceneEventFilter@QDeclarativeFlickable@@MAE_NPAVQGraphicsItem@@PAVQEvent@@@Z @ 2265 NONAME ; bool QDeclarativeFlickable::sceneEventFilter(class QGraphicsItem *, class QEvent *)
 	?sceneEventFilter@QDeclarativePathView@@MAE_NPAVQGraphicsItem@@PAVQEvent@@@Z @ 2266 NONAME ; bool QDeclarativePathView::sceneEventFilter(class QGraphicsItem *, class QEvent *)
-	?sceneHoverMoveEventToMouseEvent@QDeclarativeWebView@@AAEPAVQMouseEvent@@PAVQGraphicsSceneHoverEvent@@@Z @ 2267 NONAME ; class QMouseEvent * QDeclarativeWebView::sceneHoverMoveEventToMouseEvent(class QGraphicsSceneHoverEvent *)
-	?sceneMouseEventToMouseEvent@QDeclarativeWebView@@AAEPAVQMouseEvent@@PAVQGraphicsSceneMouseEvent@@@Z @ 2268 NONAME ; class QMouseEvent * QDeclarativeWebView::sceneMouseEventToMouseEvent(class QGraphicsSceneMouseEvent *)
+	?sceneHoverMoveEventToMouseEvent@QDeclarativeWebView@@AAEPAVQMouseEvent@@PAVQGraphicsSceneHoverEvent@@@Z @ 2267 NONAME ABSENT ; class QMouseEvent * QDeclarativeWebView::sceneHoverMoveEventToMouseEvent(class QGraphicsSceneHoverEvent *)
+	?sceneMouseEventToMouseEvent@QDeclarativeWebView@@AAEPAVQMouseEvent@@PAVQGraphicsSceneMouseEvent@@@Z @ 2268 NONAME ABSENT ; class QMouseEvent * QDeclarativeWebView::sceneMouseEventToMouseEvent(class QGraphicsSceneMouseEvent *)
 	?sceneResized@QDeclarativeView@@IAEXVQSize@@@Z @ 2269 NONAME ; void QDeclarativeView::sceneResized(class QSize)
 	?sciRequestFinished@QDeclarativeBorderImage@@AAEXXZ @ 2270 NONAME ; void QDeclarativeBorderImage::sciRequestFinished(void)
 	?scopeObject@QDeclarativeExpression@@QBEPAVQObject@@XZ @ 2271 NONAME ; class QObject * QDeclarativeExpression::scopeObject(void) const
@@ -2306,25 +2306,25 @@ EXPORTS
 	?sendMouseEvent@QDeclarativePathView@@IAE_NPAVQGraphicsSceneMouseEvent@@@Z @ 2305 NONAME ; bool QDeclarativePathView::sendMouseEvent(class QGraphicsSceneMouseEvent *)
 	?serialize@QMetaObjectBuilder@@QBEXAAVQDataStream@@@Z @ 2306 NONAME ; void QMetaObjectBuilder::serialize(class QDataStream &) const
 	?set@QDeclarativeListModel@@QAEXHABVQScriptValue@@@Z @ 2307 NONAME ; void QDeclarativeListModel::set(int, class QScriptValue const &)
-	?setAcceleration@QDeclarativeParticleMotionGravity@@QAEXM@Z @ 2308 NONAME ; void QDeclarativeParticleMotionGravity::setAcceleration(float)
+	?setAcceleration@QDeclarativeParticleMotionGravity@@QAEXM@Z @ 2308 NONAME ABSENT ; void QDeclarativeParticleMotionGravity::setAcceleration(float)
 	?setAcceptedButtons@QDeclarativeMouseArea@@QAEXV?$QFlags@W4MouseButton@Qt@@@@@Z @ 2309 NONAME ; void QDeclarativeMouseArea::setAcceptedButtons(class QFlags<enum Qt::MouseButton>)
 	?setAccess@QMetaMethodBuilder@@QAEXW4Access@QMetaMethod@@@Z @ 2310 NONAME ; void QMetaMethodBuilder::setAccess(enum QMetaMethod::Access)
 	?setAdd@QDeclarativeBasePositioner@@QAEXPAVQDeclarativeTransition@@@Z @ 2311 NONAME ; void QDeclarativeBasePositioner::setAdd(class QDeclarativeTransition *)
-	?setAngle@QDeclarativeParticles@@QAEXM@Z @ 2312 NONAME ; void QDeclarativeParticles::setAngle(float)
-	?setAngleDeviation@QDeclarativeParticles@@QAEXM@Z @ 2313 NONAME ; void QDeclarativeParticles::setAngleDeviation(float)
+	?setAngle@QDeclarativeParticles@@QAEXM@Z @ 2312 NONAME ABSENT ; void QDeclarativeParticles::setAngle(float)
+	?setAngleDeviation@QDeclarativeParticles@@QAEXM@Z @ 2313 NONAME ABSENT ; void QDeclarativeParticles::setAngleDeviation(float)
 	?setAnimation@QDeclarativeBehavior@@QAEXPAVQDeclarativeAbstractAnimation@@@Z @ 2314 NONAME ; void QDeclarativeBehavior::setAnimation(class QDeclarativeAbstractAnimation *)
 	?setAsynchronous@QDeclarativeImageBase@@QAEX_N@Z @ 2315 NONAME ; void QDeclarativeImageBase::setAsynchronous(bool)
 	?setAttributes@QMetaMethodBuilder@@QAEXH@Z @ 2316 NONAME ; void QMetaMethodBuilder::setAttributes(int)
 	?setAxis@QDeclarativeDrag@@QAEXW4Axis@1@@Z @ 2317 NONAME ; void QDeclarativeDrag::setAxis(enum QDeclarativeDrag::Axis)
-	?setBack@QDeclarativeFlipable@@QAEXPAVQDeclarativeItem@@@Z @ 2318 NONAME ; void QDeclarativeFlipable::setBack(class QDeclarativeItem *)
+	?setBack@QDeclarativeFlipable@@QAEXPAVQDeclarativeItem@@@Z @ 2318 NONAME ABSENT ; void QDeclarativeFlipable::setBack(class QDeclarativeItem *)
 	?setBaseUrl@QDeclarativeContext@@QAEXABVQUrl@@@Z @ 2319 NONAME ; void QDeclarativeContext::setBaseUrl(class QUrl const &)
 	?setBaseUrl@QDeclarativeEngine@@QAEXABVQUrl@@@Z @ 2320 NONAME ; void QDeclarativeEngine::setBaseUrl(class QUrl const &)
-	?setBaseline@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2321 NONAME ; void QDeclarativeAnchorChanges::setBaseline(class QDeclarativeAnchorLine const &)
-	?setBaseline@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2322 NONAME ; void QDeclarativeAnchors::setBaseline(class QDeclarativeAnchorLine const &)
+	?setBaseline@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2321 NONAME ABSENT ; void QDeclarativeAnchorChanges::setBaseline(class QDeclarativeAnchorLine const &)
+	?setBaseline@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2322 NONAME ABSENT ; void QDeclarativeAnchors::setBaseline(class QDeclarativeAnchorLine const &)
 	?setBaselineOffset@QDeclarativeAnchors@@QAEXM@Z @ 2323 NONAME ; void QDeclarativeAnchors::setBaselineOffset(float)
 	?setBaselineOffset@QDeclarativeItem@@QAEXM@Z @ 2324 NONAME ; void QDeclarativeItem::setBaselineOffset(float)
-	?setBottom@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2325 NONAME ; void QDeclarativeAnchorChanges::setBottom(class QDeclarativeAnchorLine const &)
-	?setBottom@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2326 NONAME ; void QDeclarativeAnchors::setBottom(class QDeclarativeAnchorLine const &)
+	?setBottom@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2325 NONAME ABSENT ; void QDeclarativeAnchorChanges::setBottom(class QDeclarativeAnchorLine const &)
+	?setBottom@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2326 NONAME ABSENT ; void QDeclarativeAnchors::setBottom(class QDeclarativeAnchorLine const &)
 	?setBottom@QDeclarativeScaleGrid@@QAEXH@Z @ 2327 NONAME ; void QDeclarativeScaleGrid::setBottom(int)
 	?setBottomMargin@QDeclarativeAnchors@@QAEXM@Z @ 2328 NONAME ; void QDeclarativeAnchors::setBottomMargin(float)
 	?setCacheBuffer@QDeclarativeGridView@@QAEXH@Z @ 2329 NONAME ; void QDeclarativeGridView::setCacheBuffer(int)
@@ -2347,7 +2347,7 @@ EXPORTS
 	?setColumnNumber@QDeclarativeDebugFileReference@@QAEXH@Z @ 2346 NONAME ; void QDeclarativeDebugFileReference::setColumnNumber(int)
 	?setColumns@QDeclarativeGrid@@QAEXH@Z @ 2347 NONAME ; void QDeclarativeGrid::setColumns(int)
 	?setConsistentTime@QDeclarativeItemPrivate@@SAXH@Z @ 2348 NONAME ; void QDeclarativeItemPrivate::setConsistentTime(int)
-	?setContent@QDeclarativeWebView@@QAEXABVQByteArray@@ABVQString@@ABVQUrl@@@Z @ 2349 NONAME ; void QDeclarativeWebView::setContent(class QByteArray const &, class QString const &, class QUrl const &)
+	?setContent@QDeclarativeWebView@@QAEXABVQByteArray@@ABVQString@@ABVQUrl@@@Z @ 2349 NONAME ABSENT ; void QDeclarativeWebView::setContent(class QByteArray const &, class QString const &, class QUrl const &)
 	?setContentHeight@QDeclarativeFlickable@@QAEXM@Z @ 2350 NONAME ; void QDeclarativeFlickable::setContentHeight(float)
 	?setContentWidth@QDeclarativeFlickable@@QAEXM@Z @ 2351 NONAME ; void QDeclarativeFlickable::setContentWidth(float)
 	?setContentX@QDeclarativeFlickable@@QAEXM@Z @ 2352 NONAME ; void QDeclarativeFlickable::setContentX(float)
@@ -2364,8 +2364,8 @@ EXPORTS
 	?setControl2Y@QDeclarativePathCubic@@QAEXM@Z @ 2363 NONAME ; void QDeclarativePathCubic::setControl2Y(float)
 	?setControlX@QDeclarativePathQuad@@QAEXM@Z @ 2364 NONAME ; void QDeclarativePathQuad::setControlX(float)
 	?setControlY@QDeclarativePathQuad@@QAEXM@Z @ 2365 NONAME ; void QDeclarativePathQuad::setControlY(float)
-	?setCount@QDeclarativeParticles@@QAEXH@Z @ 2366 NONAME ; void QDeclarativeParticles::setCount(int)
-	?setCreationContext@QDeclarativeComponent@@QAEXPAVQDeclarativeContext@@@Z @ 2367 NONAME ; void QDeclarativeComponent::setCreationContext(class QDeclarativeContext *)
+	?setCount@QDeclarativeParticles@@QAEXH@Z @ 2366 NONAME ABSENT ; void QDeclarativeParticles::setCount(int)
+	?setCreationContext@QDeclarativeComponent@@QAEXPAVQDeclarativeContext@@@Z @ 2367 NONAME ABSENT ; void QDeclarativeComponent::setCreationContext(class QDeclarativeContext *)
 	?setCriteria@QDeclarativeViewSection@@QAEXW4SectionCriteria@1@@Z @ 2368 NONAME ; void QDeclarativeViewSection::setCriteria(enum QDeclarativeViewSection::SectionCriteria)
 	?setCurrentFrame@QDeclarativeAnimatedImage@@QAEXH@Z @ 2369 NONAME ; void QDeclarativeAnimatedImage::setCurrentFrame(int)
 	?setCurrentIndex@QDeclarativeGridView@@QAEXH@Z @ 2370 NONAME ; void QDeclarativeGridView::setCurrentIndex(int)
@@ -2380,10 +2380,10 @@ EXPORTS
 	?setDamping@QDeclarativeSpringFollow@@QAEXM@Z @ 2379 NONAME ; void QDeclarativeSpringFollow::setDamping(float)
 	?setData@QDeclarativeComponent@@QAEXABVQByteArray@@ABVQUrl@@@Z @ 2380 NONAME ; void QDeclarativeComponent::setData(class QByteArray const &, class QUrl const &)
 	?setData@QListModelInterface@@UAE_NHABV?$QHash@HVQVariant@@@@@Z @ 2381 NONAME ; bool QListModelInterface::setData(int, class QHash<int, class QVariant> const &)
-	?setDate@QDeclarativeDateTimeFormatter@@QAEXABVQDate@@@Z @ 2382 NONAME ; void QDeclarativeDateTimeFormatter::setDate(class QDate const &)
-	?setDateFormat@QDeclarativeDateTimeFormatter@@QAEXABVQString@@@Z @ 2383 NONAME ; void QDeclarativeDateTimeFormatter::setDateFormat(class QString const &)
-	?setDateTime@QDeclarativeDateTimeFormatter@@QAEXABVQDateTime@@@Z @ 2384 NONAME ; void QDeclarativeDateTimeFormatter::setDateTime(class QDateTime const &)
-	?setDateTimeFormat@QDeclarativeDateTimeFormatter@@QAEXABVQString@@@Z @ 2385 NONAME ; void QDeclarativeDateTimeFormatter::setDateTimeFormat(class QString const &)
+	?setDate@QDeclarativeDateTimeFormatter@@QAEXABVQDate@@@Z @ 2382 NONAME ABSENT ; void QDeclarativeDateTimeFormatter::setDate(class QDate const &)
+	?setDateFormat@QDeclarativeDateTimeFormatter@@QAEXABVQString@@@Z @ 2383 NONAME ABSENT ; void QDeclarativeDateTimeFormatter::setDateFormat(class QString const &)
+	?setDateTime@QDeclarativeDateTimeFormatter@@QAEXABVQDateTime@@@Z @ 2384 NONAME ABSENT ; void QDeclarativeDateTimeFormatter::setDateTime(class QDateTime const &)
+	?setDateTimeFormat@QDeclarativeDateTimeFormatter@@QAEXABVQString@@@Z @ 2385 NONAME ABSENT ; void QDeclarativeDateTimeFormatter::setDateTimeFormat(class QString const &)
 	?setDelegate@QDeclarativeGridView@@QAEXPAVQDeclarativeComponent@@@Z @ 2386 NONAME ; void QDeclarativeGridView::setDelegate(class QDeclarativeComponent *)
 	?setDelegate@QDeclarativeListView@@QAEXPAVQDeclarativeComponent@@@Z @ 2387 NONAME ; void QDeclarativeListView::setDelegate(class QDeclarativeComponent *)
 	?setDelegate@QDeclarativePathView@@QAEXPAVQDeclarativeComponent@@@Z @ 2388 NONAME ; void QDeclarativePathView::setDelegate(class QDeclarativeComponent *)
@@ -2393,24 +2393,24 @@ EXPORTS
 	?setDescription@QDeclarativeError@@QAEXABVQString@@@Z @ 2392 NONAME ; void QDeclarativeError::setDescription(class QString const &)
 	?setDesignable@QMetaPropertyBuilder@@QAEX_N@Z @ 2393 NONAME ; void QMetaPropertyBuilder::setDesignable(bool)
 	?setDragMargin@QDeclarativePathView@@QAEXM@Z @ 2394 NONAME ; void QDeclarativePathView::setDragMargin(float)
-	?setDuration@QDeclarativeEaseFollow@@QAEXM@Z @ 2395 NONAME ; void QDeclarativeEaseFollow::setDuration(float)
+	?setDuration@QDeclarativeEaseFollow@@QAEXM@Z @ 2395 NONAME ABSENT ; void QDeclarativeEaseFollow::setDuration(float)
 	?setDynamic@QMetaPropertyBuilder@@QAEX_N@Z @ 2396 NONAME ; void QMetaPropertyBuilder::setDynamic(bool)
 	?setEchoMode@QDeclarativeTextInput@@QAEXW4EchoMode@1@@Z @ 2397 NONAME ; void QDeclarativeTextInput::setEchoMode(enum QDeclarativeTextInput::EchoMode)
 	?setEditable@QMetaPropertyBuilder@@QAEX_N@Z @ 2398 NONAME ; void QMetaPropertyBuilder::setEditable(bool)
 	?setElideMode@QDeclarativeText@@QAEXW4TextElideMode@1@@Z @ 2399 NONAME ; void QDeclarativeText::setElideMode(enum QDeclarativeText::TextElideMode)
-	?setEmissionRate@QDeclarativeParticles@@QAEXH@Z @ 2400 NONAME ; void QDeclarativeParticles::setEmissionRate(int)
-	?setEmissionVariance@QDeclarativeParticles@@QAEXM@Z @ 2401 NONAME ; void QDeclarativeParticles::setEmissionVariance(float)
+	?setEmissionRate@QDeclarativeParticles@@QAEXH@Z @ 2400 NONAME ABSENT ; void QDeclarativeParticles::setEmissionRate(int)
+	?setEmissionVariance@QDeclarativeParticles@@QAEXM@Z @ 2401 NONAME ABSENT ; void QDeclarativeParticles::setEmissionVariance(float)
 	?setEnabled@QDeclarativeBehavior@@QAEX_N@Z @ 2402 NONAME ; void QDeclarativeBehavior::setEnabled(bool)
 	?setEnabled@QDeclarativeDebugClient@@QAEX_N@Z @ 2403 NONAME ; void QDeclarativeDebugClient::setEnabled(bool)
-	?setEnabled@QDeclarativeEaseFollow@@QAEX_N@Z @ 2404 NONAME ; void QDeclarativeEaseFollow::setEnabled(bool)
+	?setEnabled@QDeclarativeEaseFollow@@QAEX_N@Z @ 2404 NONAME ABSENT ; void QDeclarativeEaseFollow::setEnabled(bool)
 	?setEnabled@QDeclarativeMouseArea@@QAEX_N@Z @ 2405 NONAME ; void QDeclarativeMouseArea::setEnabled(bool)
 	?setEnabled@QDeclarativeSpringFollow@@QAEX_N@Z @ 2406 NONAME ; void QDeclarativeSpringFollow::setEnabled(bool)
 	?setEnumOrFlag@QMetaPropertyBuilder@@QAEX_N@Z @ 2407 NONAME ; void QMetaPropertyBuilder::setEnumOrFlag(bool)
 	?setEpsilon@QDeclarativeSpringFollow@@QAEXM@Z @ 2408 NONAME ; void QDeclarativeSpringFollow::setEpsilon(float)
 	?setExpression@QDeclarativeExpression@@QAEXABVQString@@@Z @ 2409 NONAME ; void QDeclarativeExpression::setExpression(class QString const &)
 	?setExtends@QDeclarativeState@@QAEXABVQString@@@Z @ 2410 NONAME ; void QDeclarativeState::setExtends(class QString const &)
-	?setFadeInDuration@QDeclarativeParticles@@QAEXH@Z @ 2411 NONAME ; void QDeclarativeParticles::setFadeInDuration(int)
-	?setFadeOutDuration@QDeclarativeParticles@@QAEXH@Z @ 2412 NONAME ; void QDeclarativeParticles::setFadeOutDuration(int)
+	?setFadeInDuration@QDeclarativeParticles@@QAEXH@Z @ 2411 NONAME ABSENT ; void QDeclarativeParticles::setFadeInDuration(int)
+	?setFadeOutDuration@QDeclarativeParticles@@QAEXH@Z @ 2412 NONAME ABSENT ; void QDeclarativeParticles::setFadeOutDuration(int)
 	?setFill@QDeclarativeAnchors@@QAEXPAVQDeclarativeItem@@@Z @ 2413 NONAME ; void QDeclarativeAnchors::setFill(class QDeclarativeItem *)
 	?setFillColor@QDeclarativePaintedItem@@QAEXABVQColor@@@Z @ 2414 NONAME ; void QDeclarativePaintedItem::setFillColor(class QColor const &)
 	?setFillMode@QDeclarativeImage@@QAEXW4FillMode@1@@Z @ 2415 NONAME ; void QDeclarativeImage::setFillMode(enum QDeclarativeImage::FillMode)
@@ -2426,9 +2426,9 @@ EXPORTS
 	?setFont@QDeclarativeTextEdit@@QAEXABVQFont@@@Z @ 2425 NONAME ; void QDeclarativeTextEdit::setFont(class QFont const &)
 	?setFont@QDeclarativeTextInput@@QAEXABVQFont@@@Z @ 2426 NONAME ; void QDeclarativeTextInput::setFont(class QFont const &)
 	?setFooter@QDeclarativeListView@@QAEXPAVQDeclarativeComponent@@@Z @ 2427 NONAME ; void QDeclarativeListView::setFooter(class QDeclarativeComponent *)
-	?setFormat@QDeclarativeNumberFormatter@@QAEXABVQString@@@Z @ 2428 NONAME ; void QDeclarativeNumberFormatter::setFormat(class QString const &)
+	?setFormat@QDeclarativeNumberFormatter@@QAEXABVQString@@@Z @ 2428 NONAME ABSENT ; void QDeclarativeNumberFormatter::setFormat(class QString const &)
 	?setFromState@QDeclarativeTransition@@QAEXABVQString@@@Z @ 2429 NONAME ; void QDeclarativeTransition::setFromState(class QString const &)
-	?setFront@QDeclarativeFlipable@@QAEXPAVQDeclarativeItem@@@Z @ 2430 NONAME ; void QDeclarativeFlipable::setFront(class QDeclarativeItem *)
+	?setFront@QDeclarativeFlipable@@QAEXPAVQDeclarativeItem@@@Z @ 2430 NONAME ABSENT ; void QDeclarativeFlipable::setFront(class QDeclarativeItem *)
 	?setGradient@QDeclarativeRectangle@@QAEXPAVQDeclarativeGradient@@@Z @ 2431 NONAME ; void QDeclarativeRectangle::setGradient(class QDeclarativeGradient *)
 	?setGraphicsObject@QDeclarativeGraphicsObjectContainer@@QAEXPAVQGraphicsObject@@@Z @ 2432 NONAME ; void QDeclarativeGraphicsObjectContainer::setGraphicsObject(class QGraphicsObject *)
 	?setGridScaledImage@QDeclarativeBorderImage@@AAEXABVQDeclarativeGridScaledImage@@@Z @ 2433 NONAME ; void QDeclarativeBorderImage::setGridScaledImage(class QDeclarativeGridScaledImage const &)
@@ -2445,14 +2445,14 @@ EXPORTS
 	?setHighlightMoveSpeed@QDeclarativeListView@@QAEXM@Z @ 2444 NONAME ; void QDeclarativeListView::setHighlightMoveSpeed(float)
 	?setHighlightRangeMode@QDeclarativeListView@@QAEXW4HighlightRangeMode@1@@Z @ 2445 NONAME ; void QDeclarativeListView::setHighlightRangeMode(enum QDeclarativeListView::HighlightRangeMode)
 	?setHighlightResizeSpeed@QDeclarativeListView@@QAEXM@Z @ 2446 NONAME ; void QDeclarativeListView::setHighlightResizeSpeed(float)
-	?setHorizontalCenter@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2447 NONAME ; void QDeclarativeAnchorChanges::setHorizontalCenter(class QDeclarativeAnchorLine const &)
-	?setHorizontalCenter@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2448 NONAME ; void QDeclarativeAnchors::setHorizontalCenter(class QDeclarativeAnchorLine const &)
+	?setHorizontalCenter@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2447 NONAME ABSENT ; void QDeclarativeAnchorChanges::setHorizontalCenter(class QDeclarativeAnchorLine const &)
+	?setHorizontalCenter@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2448 NONAME ABSENT ; void QDeclarativeAnchors::setHorizontalCenter(class QDeclarativeAnchorLine const &)
 	?setHorizontalCenterOffset@QDeclarativeAnchors@@QAEXM@Z @ 2449 NONAME ; void QDeclarativeAnchors::setHorizontalCenterOffset(float)
 	?setHorizontalTileMode@QDeclarativeBorderImage@@QAEXW4TileMode@1@@Z @ 2450 NONAME ; void QDeclarativeBorderImage::setHorizontalTileMode(enum QDeclarativeBorderImage::TileMode)
 	?setHovered@QDeclarativeMouseArea@@IAEX_N@Z @ 2451 NONAME ; void QDeclarativeMouseArea::setHovered(bool)
-	?setHtml@QDeclarativeWebView@@QAEXABVQString@@ABVQUrl@@@Z @ 2452 NONAME ; void QDeclarativeWebView::setHtml(class QString const &, class QUrl const &)
-	?setIdProperty@QDeclarativeContextPrivate@@QAEXHPAVQObject@@@Z @ 2453 NONAME ; void QDeclarativeContextPrivate::setIdProperty(int, class QObject *)
-	?setIdPropertyData@QDeclarativeContextPrivate@@QAEXPAVQDeclarativeIntegerCache@@@Z @ 2454 NONAME ; void QDeclarativeContextPrivate::setIdPropertyData(class QDeclarativeIntegerCache *)
+	?setHtml@QDeclarativeWebView@@QAEXABVQString@@ABVQUrl@@@Z @ 2452 NONAME ABSENT ; void QDeclarativeWebView::setHtml(class QString const &, class QUrl const &)
+	?setIdProperty@QDeclarativeContextPrivate@@QAEXHPAVQObject@@@Z @ 2453 NONAME ABSENT ; void QDeclarativeContextPrivate::setIdProperty(int, class QObject *)
+	?setIdPropertyData@QDeclarativeContextPrivate@@QAEXPAVQDeclarativeIntegerCache@@@Z @ 2454 NONAME ABSENT ; void QDeclarativeContextPrivate::setIdPropertyData(class QDeclarativeIntegerCache *)
 	?setImplicitHeight@QDeclarativeItem@@IAEXM@Z @ 2455 NONAME ; void QDeclarativeItem::setImplicitHeight(float)
 	?setImplicitWidth@QDeclarativeItem@@IAEXM@Z @ 2456 NONAME ; void QDeclarativeItem::setImplicitWidth(float)
 	?setInputMask@QDeclarativeTextInput@@QAEXABVQString@@@Z @ 2457 NONAME ; void QDeclarativeTextInput::setInputMask(class QString const &)
@@ -2462,21 +2462,21 @@ EXPORTS
 	?setIsFlag@QMetaEnumBuilder@@QAEX_N@Z @ 2461 NONAME ; void QMetaEnumBuilder::setIsFlag(bool)
 	?setIsKey@QDeclarativeXmlListModelRole@@QAEX_N@Z @ 2462 NONAME ; void QDeclarativeXmlListModelRole::setIsKey(bool)
 	?setKeepMouseGrab@QDeclarativeItem@@QAEX_N@Z @ 2463 NONAME ; void QDeclarativeItem::setKeepMouseGrab(bool)
-	?setLeft@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2464 NONAME ; void QDeclarativeAnchorChanges::setLeft(class QDeclarativeAnchorLine const &)
-	?setLeft@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2465 NONAME ; void QDeclarativeAnchors::setLeft(class QDeclarativeAnchorLine const &)
+	?setLeft@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2464 NONAME ABSENT ; void QDeclarativeAnchorChanges::setLeft(class QDeclarativeAnchorLine const &)
+	?setLeft@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2465 NONAME ABSENT ; void QDeclarativeAnchors::setLeft(class QDeclarativeAnchorLine const &)
 	?setLeft@QDeclarativeScaleGrid@@QAEXH@Z @ 2466 NONAME ; void QDeclarativeScaleGrid::setLeft(int)
 	?setLeftMargin@QDeclarativeAnchors@@QAEXM@Z @ 2467 NONAME ; void QDeclarativeAnchors::setLeftMargin(float)
-	?setLifeSpan@QDeclarativeParticles@@QAEXH@Z @ 2468 NONAME ; void QDeclarativeParticles::setLifeSpan(int)
-	?setLifeSpanDeviation@QDeclarativeParticles@@QAEXH@Z @ 2469 NONAME ; void QDeclarativeParticles::setLifeSpanDeviation(int)
+	?setLifeSpan@QDeclarativeParticles@@QAEXH@Z @ 2468 NONAME ABSENT ; void QDeclarativeParticles::setLifeSpan(int)
+	?setLifeSpanDeviation@QDeclarativeParticles@@QAEXH@Z @ 2469 NONAME ABSENT ; void QDeclarativeParticles::setLifeSpanDeviation(int)
 	?setLine@QDeclarativeError@@QAEXH@Z @ 2470 NONAME ; void QDeclarativeError::setLine(int)
 	?setLineNumber@QDeclarativeDebugFileReference@@QAEXH@Z @ 2471 NONAME ; void QDeclarativeDebugFileReference::setLineNumber(int)
 	?setList@QDeclarativeListAccessor@@QAEXABVQVariant@@PAVQDeclarativeEngine@@@Z @ 2472 NONAME ; void QDeclarativeListAccessor::setList(class QVariant const &, class QDeclarativeEngine *)
 	?setLoading@QDeclarativePixmapReply@@AAEXXZ @ 2473 NONAME ; void QDeclarativePixmapReply::setLoading(void)
-	?setLongStyle@QDeclarativeDateTimeFormatter@@QAEX_N@Z @ 2474 NONAME ; void QDeclarativeDateTimeFormatter::setLongStyle(bool)
+	?setLongStyle@QDeclarativeDateTimeFormatter@@QAEX_N@Z @ 2474 NONAME ABSENT ; void QDeclarativeDateTimeFormatter::setLongStyle(bool)
 	?setMargins@QDeclarativeAnchors@@QAEXM@Z @ 2475 NONAME ; void QDeclarativeAnchors::setMargins(float)
 	?setMass@QDeclarativeSpringFollow@@QAEXM@Z @ 2476 NONAME ; void QDeclarativeSpringFollow::setMass(float)
 	?setMaxLength@QDeclarativeTextInput@@QAEXH@Z @ 2477 NONAME ; void QDeclarativeTextInput::setMaxLength(int)
-	?setMaximumEasingTime@QDeclarativeEaseFollow@@QAEXM@Z @ 2478 NONAME ; void QDeclarativeEaseFollow::setMaximumEasingTime(float)
+	?setMaximumEasingTime@QDeclarativeEaseFollow@@QAEXM@Z @ 2478 NONAME ABSENT ; void QDeclarativeEaseFollow::setMaximumEasingTime(float)
 	?setMaximumFlickVelocity@QDeclarativeFlickable@@QAEXM@Z @ 2479 NONAME ; void QDeclarativeFlickable::setMaximumFlickVelocity(float)
 	?setMaximumPacketSize@QPacketProtocol@@QAEHH@Z @ 2480 NONAME ; int QPacketProtocol::setMaximumPacketSize(int)
 	?setModel@QDeclarativeGridView@@QAEXABVQVariant@@@Z @ 2481 NONAME ; void QDeclarativeGridView::setModel(class QVariant const &)
@@ -2485,7 +2485,7 @@ EXPORTS
 	?setModel@QDeclarativeRepeater@@QAEXABVQVariant@@@Z @ 2484 NONAME ; void QDeclarativeRepeater::setModel(class QVariant const &)
 	?setModel@QDeclarativeVisualDataModel@@QAEXABVQVariant@@@Z @ 2485 NONAME ; void QDeclarativeVisualDataModel::setModel(class QVariant const &)
 	?setModulus@QDeclarativeSpringFollow@@QAEXM@Z @ 2486 NONAME ; void QDeclarativeSpringFollow::setModulus(float)
-	?setMotion@QDeclarativeParticles@@QAEXPAVQDeclarativeParticleMotion@@@Z @ 2487 NONAME ; void QDeclarativeParticles::setMotion(class QDeclarativeParticleMotion *)
+	?setMotion@QDeclarativeParticles@@QAEXPAVQDeclarativeParticleMotion@@@Z @ 2487 NONAME ABSENT ; void QDeclarativeParticles::setMotion(class QDeclarativeParticleMotion *)
 	?setMove@QDeclarativeBasePositioner@@QAEXPAVQDeclarativeTransition@@@Z @ 2488 NONAME ; void QDeclarativeBasePositioner::setMove(class QDeclarativeTransition *)
 	?setName@QDeclarativeFontLoader@@QAEXABVQString@@@Z @ 2489 NONAME ; void QDeclarativeFontLoader::setName(class QString const &)
 	?setName@QDeclarativePathAttribute@@QAEXABVQString@@@Z @ 2490 NONAME ; void QDeclarativePathAttribute::setName(class QString const &)
@@ -2494,11 +2494,11 @@ EXPORTS
 	?setName@QDeclarativeXmlListModelRole@@QAEXABVQString@@@Z @ 2493 NONAME ; void QDeclarativeXmlListModelRole::setName(class QString const &)
 	?setNamespaceDeclarations@QDeclarativeXmlListModel@@QAEXABVQString@@@Z @ 2494 NONAME ; void QDeclarativeXmlListModel::setNamespaceDeclarations(class QString const &)
 	?setNetworkAccessManagerFactory@QDeclarativeEngine@@QAEXPAVQDeclarativeNetworkAccessManagerFactory@@@Z @ 2495 NONAME ; void QDeclarativeEngine::setNetworkAccessManagerFactory(class QDeclarativeNetworkAccessManagerFactory *)
-	?setNewWindowComponent@QDeclarativeWebView@@QAEXPAVQDeclarativeComponent@@@Z @ 2496 NONAME ; void QDeclarativeWebView::setNewWindowComponent(class QDeclarativeComponent *)
-	?setNewWindowParent@QDeclarativeWebView@@QAEXPAVQDeclarativeItem@@@Z @ 2497 NONAME ; void QDeclarativeWebView::setNewWindowParent(class QDeclarativeItem *)
+	?setNewWindowComponent@QDeclarativeWebView@@QAEXPAVQDeclarativeComponent@@@Z @ 2496 NONAME ABSENT ; void QDeclarativeWebView::setNewWindowComponent(class QDeclarativeComponent *)
+	?setNewWindowParent@QDeclarativeWebView@@QAEXPAVQDeclarativeItem@@@Z @ 2497 NONAME ABSENT ; void QDeclarativeWebView::setNewWindowParent(class QDeclarativeItem *)
 	?setNotifyOnValueChanged@QDeclarativeExpression@@QAEX_N@Z @ 2498 NONAME ; void QDeclarativeExpression::setNotifyOnValueChanged(bool)
 	?setNotifySignal@QMetaPropertyBuilder@@QAEXABVQMetaMethodBuilder@@@Z @ 2499 NONAME ; void QMetaPropertyBuilder::setNotifySignal(class QMetaMethodBuilder const &)
-	?setNumber@QDeclarativeNumberFormatter@@QAEXABM@Z @ 2500 NONAME ; void QDeclarativeNumberFormatter::setNumber(float const &)
+	?setNumber@QDeclarativeNumberFormatter@@QAEXABM@Z @ 2500 NONAME ABSENT ; void QDeclarativeNumberFormatter::setNumber(float const &)
 	?setObject@QDeclarativeAnchorChanges@@QAEXPAVQDeclarativeItem@@@Z @ 2501 NONAME ; void QDeclarativeAnchorChanges::setObject(class QDeclarativeItem *)
 	?setObject@QDeclarativeBind@@QAEXPAVQObject@@@Z @ 2502 NONAME ; void QDeclarativeBind::setObject(class QObject *)
 	?setObject@QDeclarativeParentChange@@QAEXPAVQDeclarativeItem@@@Z @ 2503 NONAME ; void QDeclarativeParentChange::setObject(class QDeclarativeItem *)
@@ -2507,10 +2507,10 @@ EXPORTS
 	?setOffset@QDeclarativePathView@@QAEXM@Z @ 2506 NONAME ; void QDeclarativePathView::setOffset(float)
 	?setOrientation@QDeclarativeListView@@QAEXW4Orientation@1@@Z @ 2507 NONAME ; void QDeclarativeListView::setOrientation(enum QDeclarativeListView::Orientation)
 	?setOverShoot@QDeclarativeFlickable@@QAEX_N@Z @ 2508 NONAME ; void QDeclarativeFlickable::setOverShoot(bool)
-	?setPace@QDeclarativeParticleMotionWander@@QAEXM@Z @ 2509 NONAME ; void QDeclarativeParticleMotionWander::setPace(float)
-	?setPage@QDeclarativeWebView@@QAEXPAVQWebPage@@@Z @ 2510 NONAME ; void QDeclarativeWebView::setPage(class QWebPage *)
+	?setPace@QDeclarativeParticleMotionWander@@QAEXM@Z @ 2509 NONAME ABSENT ; void QDeclarativeParticleMotionWander::setPace(float)
+	?setPage@QDeclarativeWebView@@QAEXPAVQWebPage@@@Z @ 2510 NONAME ABSENT ; void QDeclarativeWebView::setPage(class QWebPage *)
 	?setParameterNames@QMetaMethodBuilder@@QAEXABV?$QList@VQByteArray@@@@@Z @ 2511 NONAME ; void QMetaMethodBuilder::setParameterNames(class QList<class QByteArray> const &)
-	?setParent@QDeclarativeItem@@QAEXPAV1@@Z @ 2512 NONAME ; void QDeclarativeItem::setParent(class QDeclarativeItem *)
+	?setParent@QDeclarativeItem@@QAEXPAV1@@Z @ 2512 NONAME ABSENT ; void QDeclarativeItem::setParent(class QDeclarativeItem *)
 	?setParent@QDeclarativeParentChange@@QAEXPAVQDeclarativeItem@@@Z @ 2513 NONAME ; void QDeclarativeParentChange::setParent(class QDeclarativeItem *)
 	?setParentItem@QDeclarativeItem@@QAEXPAV1@@Z @ 2514 NONAME ; void QDeclarativeItem::setParentItem(class QDeclarativeItem *)
 	?setPart@QDeclarativeVisualDataModel@@QAEXABVQString@@@Z @ 2515 NONAME ; void QDeclarativeVisualDataModel::setPart(class QString const &)
@@ -2522,12 +2522,12 @@ EXPORTS
 	?setPixmap@QDeclarativeImage@@QAEXABVQPixmap@@@Z @ 2521 NONAME ; void QDeclarativeImage::setPixmap(class QPixmap const &)
 	?setPlaying@QDeclarativeAnimatedImage@@QAEX_N@Z @ 2522 NONAME ; void QDeclarativeAnimatedImage::setPlaying(bool)
 	?setPosition@QDeclarativeGradientStop@@QAEXM@Z @ 2523 NONAME ; void QDeclarativeGradientStop::setPosition(float)
-	?setPreferredHeight@QDeclarativeWebView@@QAEXH@Z @ 2524 NONAME ; void QDeclarativeWebView::setPreferredHeight(int)
+	?setPreferredHeight@QDeclarativeWebView@@QAEXH@Z @ 2524 NONAME ABSENT ; void QDeclarativeWebView::setPreferredHeight(int)
 	?setPreferredHighlightBegin@QDeclarativeListView@@QAEXM@Z @ 2525 NONAME ; void QDeclarativeListView::setPreferredHighlightBegin(float)
 	?setPreferredHighlightEnd@QDeclarativeListView@@QAEXM@Z @ 2526 NONAME ; void QDeclarativeListView::setPreferredHighlightEnd(float)
-	?setPreferredWidth@QDeclarativeWebView@@QAEXH@Z @ 2527 NONAME ; void QDeclarativeWebView::setPreferredWidth(int)
+	?setPreferredWidth@QDeclarativeWebView@@QAEXH@Z @ 2527 NONAME ABSENT ; void QDeclarativeWebView::setPreferredWidth(int)
 	?setPressDelay@QDeclarativeFlickable@@QAEXH@Z @ 2528 NONAME ; void QDeclarativeFlickable::setPressDelay(int)
-	?setPressGrabTime@QDeclarativeWebView@@QAEXH@Z @ 2529 NONAME ; void QDeclarativeWebView::setPressGrabTime(int)
+	?setPressGrabTime@QDeclarativeWebView@@QAEXH@Z @ 2529 NONAME ABSENT ; void QDeclarativeWebView::setPressGrabTime(int)
 	?setPressed@QDeclarativeMouseArea@@IAE_N_N@Z @ 2530 NONAME ; bool QDeclarativeMouseArea::setPressed(bool)
 	?setProperty@QDeclarativeBind@@QAEXABVQString@@@Z @ 2531 NONAME ; void QDeclarativeBind::setProperty(class QString const &)
 	?setProperty@QDeclarativeListModel@@QAEXHABVQString@@ABVQVariant@@@Z @ 2532 NONAME ; void QDeclarativeListModel::setProperty(int, class QString const &, class QVariant const &)
@@ -2538,9 +2538,9 @@ EXPORTS
 	?setReadOnly@QDeclarativeTextEdit@@QAEX_N@Z @ 2537 NONAME ; void QDeclarativeTextEdit::setReadOnly(bool)
 	?setReadOnly@QDeclarativeTextInput@@QAEX_N@Z @ 2538 NONAME ; void QDeclarativeTextInput::setReadOnly(bool)
 	?setReadable@QMetaPropertyBuilder@@QAEX_N@Z @ 2539 NONAME ; void QMetaPropertyBuilder::setReadable(bool)
-	?setRenderingEnabled@QDeclarativeWebView@@QAEX_N@Z @ 2540 NONAME ; void QDeclarativeWebView::setRenderingEnabled(bool)
+	?setRenderingEnabled@QDeclarativeWebView@@QAEX_N@Z @ 2540 NONAME ABSENT ; void QDeclarativeWebView::setRenderingEnabled(bool)
 	?setRepeating@QDeclarativeTimer@@QAEX_N@Z @ 2541 NONAME ; void QDeclarativeTimer::setRepeating(bool)
-	?setReset@QDeclarativeAnchorChanges@@QAEXABVQString@@@Z @ 2542 NONAME ; void QDeclarativeAnchorChanges::setReset(class QString const &)
+	?setReset@QDeclarativeAnchorChanges@@QAEXABVQString@@@Z @ 2542 NONAME ABSENT ; void QDeclarativeAnchorChanges::setReset(class QString const &)
 	?setResettable@QMetaPropertyBuilder@@QAEX_N@Z @ 2543 NONAME ; void QMetaPropertyBuilder::setResettable(bool)
 	?setResizeMode@QDeclarativeLoader@@QAEXW4ResizeMode@1@@Z @ 2544 NONAME ; void QDeclarativeLoader::setResizeMode(enum QDeclarativeLoader::ResizeMode)
 	?setResizeMode@QDeclarativeView@@QAEXW4ResizeMode@1@@Z @ 2545 NONAME ; void QDeclarativeView::setResizeMode(enum QDeclarativeView::ResizeMode)
@@ -2548,9 +2548,9 @@ EXPORTS
 	?setReturnType@QMetaMethodBuilder@@QAEXABVQByteArray@@@Z @ 2547 NONAME ; void QMetaMethodBuilder::setReturnType(class QByteArray const &)
 	?setReversed@QDeclarativeTransition@@QAEX_N@Z @ 2548 NONAME ; void QDeclarativeTransition::setReversed(bool)
 	?setReversible@QDeclarativeTransition@@QAEX_N@Z @ 2549 NONAME ; void QDeclarativeTransition::setReversible(bool)
-	?setReversingMode@QDeclarativeEaseFollow@@QAEXW4ReversingMode@1@@Z @ 2550 NONAME ; void QDeclarativeEaseFollow::setReversingMode(enum QDeclarativeEaseFollow::ReversingMode)
-	?setRight@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2551 NONAME ; void QDeclarativeAnchorChanges::setRight(class QDeclarativeAnchorLine const &)
-	?setRight@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2552 NONAME ; void QDeclarativeAnchors::setRight(class QDeclarativeAnchorLine const &)
+	?setReversingMode@QDeclarativeEaseFollow@@QAEXW4ReversingMode@1@@Z @ 2550 NONAME ABSENT ; void QDeclarativeEaseFollow::setReversingMode(enum QDeclarativeEaseFollow::ReversingMode)
+	?setRight@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2551 NONAME ABSENT ; void QDeclarativeAnchorChanges::setRight(class QDeclarativeAnchorLine const &)
+	?setRight@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2552 NONAME ABSENT ; void QDeclarativeAnchors::setRight(class QDeclarativeAnchorLine const &)
 	?setRight@QDeclarativeScaleGrid@@QAEXH@Z @ 2553 NONAME ; void QDeclarativeScaleGrid::setRight(int)
 	?setRightMargin@QDeclarativeAnchors@@QAEXM@Z @ 2554 NONAME ; void QDeclarativeAnchors::setRightMargin(float)
 	?setRootIndex@QDeclarativeVisualDataModel@@QAEXABVQModelIndex@@@Z @ 2555 NONAME ; void QDeclarativeVisualDataModel::setRootIndex(class QModelIndex const &)
@@ -2575,18 +2575,18 @@ EXPORTS
 	?setSmooth@QDeclarativeItem@@QAEX_N@Z @ 2574 NONAME ; void QDeclarativeItem::setSmooth(bool)
 	?setSmoothCache@QDeclarativePaintedItem@@QAEX_N@Z @ 2575 NONAME ; void QDeclarativePaintedItem::setSmoothCache(bool)
 	?setSnapMode@QDeclarativeListView@@QAEXW4SnapMode@1@@Z @ 2576 NONAME ; void QDeclarativeListView::setSnapMode(enum QDeclarativeListView::SnapMode)
-	?setSnapPosition@QDeclarativePathView@@QAEXM@Z @ 2577 NONAME ; void QDeclarativePathView::setSnapPosition(float)
+	?setSnapPosition@QDeclarativePathView@@QAEXM@Z @ 2577 NONAME ABSENT ; void QDeclarativePathView::setSnapPosition(float)
 	?setSource@QDeclarativeAnimatedImage@@UAEXABVQUrl@@@Z @ 2578 NONAME ; void QDeclarativeAnimatedImage::setSource(class QUrl const &)
 	?setSource@QDeclarativeBorderImage@@UAEXABVQUrl@@@Z @ 2579 NONAME ; void QDeclarativeBorderImage::setSource(class QUrl const &)
 	?setSource@QDeclarativeFontLoader@@QAEXABVQUrl@@@Z @ 2580 NONAME ; void QDeclarativeFontLoader::setSource(class QUrl const &)
 	?setSource@QDeclarativeImageBase@@UAEXABVQUrl@@@Z @ 2581 NONAME ; void QDeclarativeImageBase::setSource(class QUrl const &)
 	?setSource@QDeclarativeLoader@@QAEXABVQUrl@@@Z @ 2582 NONAME ; void QDeclarativeLoader::setSource(class QUrl const &)
-	?setSource@QDeclarativeParticles@@QAEXABVQUrl@@@Z @ 2583 NONAME ; void QDeclarativeParticles::setSource(class QUrl const &)
+	?setSource@QDeclarativeParticles@@QAEXABVQUrl@@@Z @ 2583 NONAME ABSENT ; void QDeclarativeParticles::setSource(class QUrl const &)
 	?setSource@QDeclarativeView@@QAEXABVQUrl@@@Z @ 2584 NONAME ; void QDeclarativeView::setSource(class QUrl const &)
 	?setSource@QDeclarativeXmlListModel@@QAEXABVQUrl@@@Z @ 2585 NONAME ; void QDeclarativeXmlListModel::setSource(class QUrl const &)
 	?setSourceComponent@QDeclarativeLoader@@QAEXPAVQDeclarativeComponent@@@Z @ 2586 NONAME ; void QDeclarativeLoader::setSourceComponent(class QDeclarativeComponent *)
 	?setSourceLocation@QDeclarativeExpression@@QAEXABVQString@@H@Z @ 2587 NONAME ; void QDeclarativeExpression::setSourceLocation(class QString const &, int)
-	?setSourceValue@QDeclarativeEaseFollow@@QAEXM@Z @ 2588 NONAME ; void QDeclarativeEaseFollow::setSourceValue(float)
+	?setSourceValue@QDeclarativeEaseFollow@@QAEXM@Z @ 2588 NONAME ABSENT ; void QDeclarativeEaseFollow::setSourceValue(float)
 	?setSourceValue@QDeclarativeSpringFollow@@QAEXM@Z @ 2589 NONAME ; void QDeclarativeSpringFollow::setSourceValue(float)
 	?setSpacing@QDeclarativeBasePositioner@@QAEXH@Z @ 2590 NONAME ; void QDeclarativeBasePositioner::setSpacing(int)
 	?setSpacing@QDeclarativeListView@@QAEXM@Z @ 2591 NONAME ; void QDeclarativeListView::setSpacing(float)
@@ -2599,7 +2599,7 @@ EXPORTS
 	?setState@QDeclarativeStateGroup@@QAEXABVQString@@@Z @ 2598 NONAME ; void QDeclarativeStateGroup::setState(class QString const &)
 	?setStateGroup@QDeclarativeState@@QAEXPAVQDeclarativeStateGroup@@@Z @ 2599 NONAME ; void QDeclarativeState::setStateGroup(class QDeclarativeStateGroup *)
 	?setStaticMetacallFunction@QMetaObjectBuilder@@QAEXP6AHW4Call@QMetaObject@@HPAPAX@Z@Z @ 2600 NONAME ; void QMetaObjectBuilder::setStaticMetacallFunction(int (*)(enum QMetaObject::Call, int, void * *))
-	?setStatusText@QDeclarativeWebView@@AAEXABVQString@@@Z @ 2601 NONAME ; void QDeclarativeWebView::setStatusText(class QString const &)
+	?setStatusText@QDeclarativeWebView@@AAEXABVQString@@@Z @ 2601 NONAME ABSENT ; void QDeclarativeWebView::setStatusText(class QString const &)
 	?setStdCppSet@QMetaPropertyBuilder@@QAEX_N@Z @ 2602 NONAME ; void QMetaPropertyBuilder::setStdCppSet(bool)
 	?setStored@QMetaPropertyBuilder@@QAEX_N@Z @ 2603 NONAME ; void QMetaPropertyBuilder::setStored(bool)
 	?setStyle@QDeclarativeText@@QAEXW4TextStyle@1@@Z @ 2604 NONAME ; void QDeclarativeText::setStyle(enum QDeclarativeText::TextStyle)
@@ -2609,8 +2609,8 @@ EXPORTS
 	?setTag@QMetaMethodBuilder@@QAEXABVQByteArray@@@Z @ 2608 NONAME ; void QMetaMethodBuilder::setTag(class QByteArray const &)
 	?setTarget@QDeclarativeBehavior@@UAEXABVQDeclarativeProperty@@@Z @ 2609 NONAME ; void QDeclarativeBehavior::setTarget(class QDeclarativeProperty const &)
 	?setTarget@QDeclarativeConnections@@QAEXPAVQObject@@@Z @ 2610 NONAME ; void QDeclarativeConnections::setTarget(class QObject *)
-	?setTarget@QDeclarativeDrag@@QAEXPAVQDeclarativeItem@@@Z @ 2611 NONAME ; void QDeclarativeDrag::setTarget(class QDeclarativeItem *)
-	?setTarget@QDeclarativeEaseFollow@@UAEXABVQDeclarativeProperty@@@Z @ 2612 NONAME ; void QDeclarativeEaseFollow::setTarget(class QDeclarativeProperty const &)
+	?setTarget@QDeclarativeDrag@@QAEXPAVQDeclarativeItem@@@Z @ 2611 NONAME ABSENT ; void QDeclarativeDrag::setTarget(class QDeclarativeItem *)
+	?setTarget@QDeclarativeEaseFollow@@UAEXABVQDeclarativeProperty@@@Z @ 2612 NONAME ABSENT ; void QDeclarativeEaseFollow::setTarget(class QDeclarativeProperty const &)
 	?setTarget@QDeclarativeSpringFollow@@UAEXABVQDeclarativeProperty@@@Z @ 2613 NONAME ; void QDeclarativeSpringFollow::setTarget(class QDeclarativeProperty const &)
 	?setText@QDeclarativeText@@QAEXABVQString@@@Z @ 2614 NONAME ; void QDeclarativeText::setText(class QString const &)
 	?setText@QDeclarativeTextEdit@@QAEXABVQString@@@Z @ 2615 NONAME ; void QDeclarativeTextEdit::setText(class QString const &)
@@ -2619,18 +2619,18 @@ EXPORTS
 	?setTextFormat@QDeclarativeTextEdit@@QAEXW4TextFormat@1@@Z @ 2618 NONAME ; void QDeclarativeTextEdit::setTextFormat(enum QDeclarativeTextEdit::TextFormat)
 	?setTextInteractionFlags@QDeclarativeTextEdit@@QAEXV?$QFlags@W4TextInteractionFlag@Qt@@@@@Z @ 2619 NONAME ; void QDeclarativeTextEdit::setTextInteractionFlags(class QFlags<enum Qt::TextInteractionFlag>)
 	?setTextMargin@QDeclarativeTextEdit@@QAEXM@Z @ 2620 NONAME ; void QDeclarativeTextEdit::setTextMargin(float)
-	?setTime@QDeclarativeDateTimeFormatter@@QAEXABVQTime@@@Z @ 2621 NONAME ; void QDeclarativeDateTimeFormatter::setTime(class QTime const &)
-	?setTimeFormat@QDeclarativeDateTimeFormatter@@QAEXABVQString@@@Z @ 2622 NONAME ; void QDeclarativeDateTimeFormatter::setTimeFormat(class QString const &)
+	?setTime@QDeclarativeDateTimeFormatter@@QAEXABVQTime@@@Z @ 2621 NONAME ABSENT ; void QDeclarativeDateTimeFormatter::setTime(class QTime const &)
+	?setTimeFormat@QDeclarativeDateTimeFormatter@@QAEXABVQString@@@Z @ 2622 NONAME ABSENT ; void QDeclarativeDateTimeFormatter::setTimeFormat(class QString const &)
 	?setToState@QDeclarativeTransition@@QAEXABVQString@@@Z @ 2623 NONAME ; void QDeclarativeTransition::setToState(class QString const &)
-	?setTop@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2624 NONAME ; void QDeclarativeAnchorChanges::setTop(class QDeclarativeAnchorLine const &)
-	?setTop@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2625 NONAME ; void QDeclarativeAnchors::setTop(class QDeclarativeAnchorLine const &)
+	?setTop@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2624 NONAME ABSENT ; void QDeclarativeAnchorChanges::setTop(class QDeclarativeAnchorLine const &)
+	?setTop@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2625 NONAME ABSENT ; void QDeclarativeAnchors::setTop(class QDeclarativeAnchorLine const &)
 	?setTop@QDeclarativeScaleGrid@@QAEXH@Z @ 2626 NONAME ; void QDeclarativeScaleGrid::setTop(int)
 	?setTopMargin@QDeclarativeAnchors@@QAEXM@Z @ 2627 NONAME ; void QDeclarativeAnchors::setTopMargin(float)
 	?setTransformOrigin@QDeclarativeItem@@QAEXW4TransformOrigin@1@@Z @ 2628 NONAME ; void QDeclarativeItem::setTransformOrigin(enum QDeclarativeItem::TransformOrigin)
 	?setTriggeredOnStart@QDeclarativeTimer@@QAEX_N@Z @ 2629 NONAME ; void QDeclarativeTimer::setTriggeredOnStart(bool)
 	?setUrl@QDeclarativeDebugFileReference@@QAEXABVQUrl@@@Z @ 2630 NONAME ; void QDeclarativeDebugFileReference::setUrl(class QUrl const &)
 	?setUrl@QDeclarativeError@@QAEXABVQUrl@@@Z @ 2631 NONAME ; void QDeclarativeError::setUrl(class QUrl const &)
-	?setUrl@QDeclarativeWebView@@QAEXABVQUrl@@@Z @ 2632 NONAME ; void QDeclarativeWebView::setUrl(class QUrl const &)
+	?setUrl@QDeclarativeWebView@@QAEXABVQUrl@@@Z @ 2632 NONAME ABSENT ; void QDeclarativeWebView::setUrl(class QUrl const &)
 	?setUser@QMetaPropertyBuilder@@QAEX_N@Z @ 2633 NONAME ; void QMetaPropertyBuilder::setUser(bool)
 	?setVAlign@QDeclarativeText@@QAEXW4VAlignment@1@@Z @ 2634 NONAME ; void QDeclarativeText::setVAlign(enum QDeclarativeText::VAlignment)
 	?setVAlign@QDeclarativeTextEdit@@QAEXW4VAlignment@1@@Z @ 2635 NONAME ; void QDeclarativeTextEdit::setVAlign(enum QDeclarativeTextEdit::VAlignment)
@@ -2640,12 +2640,12 @@ EXPORTS
 	?setValue@QDeclarativeOpenMetaObject@@QAEXHABVQVariant@@@Z @ 2639 NONAME ; void QDeclarativeOpenMetaObject::setValue(int, class QVariant const &)
 	?setValue@QDeclarativePathAttribute@@QAEXM@Z @ 2640 NONAME ; void QDeclarativePathAttribute::setValue(float)
 	?setValue@QDeclarativePathPercent@@QAEXM@Z @ 2641 NONAME ; void QDeclarativePathPercent::setValue(float)
-	?setVelocity@QDeclarativeEaseFollow@@QAEXM@Z @ 2642 NONAME ; void QDeclarativeEaseFollow::setVelocity(float)
-	?setVelocity@QDeclarativeParticles@@QAEXM@Z @ 2643 NONAME ; void QDeclarativeParticles::setVelocity(float)
+	?setVelocity@QDeclarativeEaseFollow@@QAEXM@Z @ 2642 NONAME ABSENT ; void QDeclarativeEaseFollow::setVelocity(float)
+	?setVelocity@QDeclarativeParticles@@QAEXM@Z @ 2643 NONAME ABSENT ; void QDeclarativeParticles::setVelocity(float)
 	?setVelocity@QDeclarativeSpringFollow@@QAEXM@Z @ 2644 NONAME ; void QDeclarativeSpringFollow::setVelocity(float)
-	?setVelocityDeviation@QDeclarativeParticles@@QAEXM@Z @ 2645 NONAME ; void QDeclarativeParticles::setVelocityDeviation(float)
-	?setVerticalCenter@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2646 NONAME ; void QDeclarativeAnchorChanges::setVerticalCenter(class QDeclarativeAnchorLine const &)
-	?setVerticalCenter@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2647 NONAME ; void QDeclarativeAnchors::setVerticalCenter(class QDeclarativeAnchorLine const &)
+	?setVelocityDeviation@QDeclarativeParticles@@QAEXM@Z @ 2645 NONAME ABSENT ; void QDeclarativeParticles::setVelocityDeviation(float)
+	?setVerticalCenter@QDeclarativeAnchorChanges@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2646 NONAME ABSENT ; void QDeclarativeAnchorChanges::setVerticalCenter(class QDeclarativeAnchorLine const &)
+	?setVerticalCenter@QDeclarativeAnchors@@QAEXABVQDeclarativeAnchorLine@@@Z @ 2647 NONAME ABSENT ; void QDeclarativeAnchors::setVerticalCenter(class QDeclarativeAnchorLine const &)
 	?setVerticalCenterOffset@QDeclarativeAnchors@@QAEXM@Z @ 2648 NONAME ; void QDeclarativeAnchors::setVerticalCenterOffset(float)
 	?setVerticalTileMode@QDeclarativeBorderImage@@QAEXW4TileMode@1@@Z @ 2649 NONAME ; void QDeclarativeBorderImage::setVerticalTileMode(enum QDeclarativeBorderImage::TileMode)
 	?setWhen@QDeclarativeBind@@QAEX_N@Z @ 2650 NONAME ; void QDeclarativeBind::setWhen(bool)
@@ -2660,49 +2660,49 @@ EXPORTS
 	?setWritable@QMetaPropertyBuilder@@QAEX_N@Z @ 2659 NONAME ; void QMetaPropertyBuilder::setWritable(bool)
 	?setX@QDeclarativeCurve@@QAEXM@Z @ 2660 NONAME ; void QDeclarativeCurve::setX(float)
 	?setX@QDeclarativeParentChange@@QAEXM@Z @ 2661 NONAME ; void QDeclarativeParentChange::setX(float)
-	?setXAttractor@QDeclarativeParticleMotionGravity@@QAEXM@Z @ 2662 NONAME ; void QDeclarativeParticleMotionGravity::setXAttractor(float)
-	?setXVariance@QDeclarativeParticleMotionWander@@QAEXM@Z @ 2663 NONAME ; void QDeclarativeParticleMotionWander::setXVariance(float)
+	?setXAttractor@QDeclarativeParticleMotionGravity@@QAEXM@Z @ 2662 NONAME ABSENT ; void QDeclarativeParticleMotionGravity::setXAttractor(float)
+	?setXVariance@QDeclarativeParticleMotionWander@@QAEXM@Z @ 2663 NONAME ABSENT ; void QDeclarativeParticleMotionWander::setXVariance(float)
 	?setXmax@QDeclarativeDrag@@QAEXM@Z @ 2664 NONAME ; void QDeclarativeDrag::setXmax(float)
 	?setXmin@QDeclarativeDrag@@QAEXM@Z @ 2665 NONAME ; void QDeclarativeDrag::setXmin(float)
 	?setXml@QDeclarativeXmlListModel@@QAEXABVQString@@@Z @ 2666 NONAME ; void QDeclarativeXmlListModel::setXml(class QString const &)
 	?setY@QDeclarativeCurve@@QAEXM@Z @ 2667 NONAME ; void QDeclarativeCurve::setY(float)
 	?setY@QDeclarativeParentChange@@QAEXM@Z @ 2668 NONAME ; void QDeclarativeParentChange::setY(float)
-	?setYAttractor@QDeclarativeParticleMotionGravity@@QAEXM@Z @ 2669 NONAME ; void QDeclarativeParticleMotionGravity::setYAttractor(float)
-	?setYVariance@QDeclarativeParticleMotionWander@@QAEXM@Z @ 2670 NONAME ; void QDeclarativeParticleMotionWander::setYVariance(float)
+	?setYAttractor@QDeclarativeParticleMotionGravity@@QAEXM@Z @ 2669 NONAME ABSENT ; void QDeclarativeParticleMotionGravity::setYAttractor(float)
+	?setYVariance@QDeclarativeParticleMotionWander@@QAEXM@Z @ 2670 NONAME ABSENT ; void QDeclarativeParticleMotionWander::setYVariance(float)
 	?setYmax@QDeclarativeDrag@@QAEXM@Z @ 2671 NONAME ; void QDeclarativeDrag::setYmax(float)
 	?setYmin@QDeclarativeDrag@@QAEXM@Z @ 2672 NONAME ; void QDeclarativeDrag::setYmin(float)
-	?setZoomFactor@QDeclarativeWebView@@QAEXM@Z @ 2673 NONAME ; void QDeclarativeWebView::setZoomFactor(float)
-	?settings@QDeclarativeWebView@@QBEPAVQWebSettings@@XZ @ 2674 NONAME ; class QWebSettings * QDeclarativeWebView::settings(void) const
-	?settingsObject@QDeclarativeWebView@@QBEPAVQDeclarativeWebSettings@@XZ @ 2675 NONAME ; class QDeclarativeWebSettings * QDeclarativeWebView::settingsObject(void) const
+	?setZoomFactor@QDeclarativeWebView@@QAEXM@Z @ 2673 NONAME ABSENT ; void QDeclarativeWebView::setZoomFactor(float)
+	?settings@QDeclarativeWebView@@QBEPAVQWebSettings@@XZ @ 2674 NONAME ABSENT ; class QWebSettings * QDeclarativeWebView::settings(void) const
+	?settingsObject@QDeclarativeWebView@@QBEPAVQDeclarativeWebSettings@@XZ @ 2675 NONAME ABSENT ; class QDeclarativeWebSettings * QDeclarativeWebView::settingsObject(void) const
 	?shadow@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 2676 NONAME ; class QColor QDeclarativeSystemPalette::shadow(void) const
 	?side@QDeclarativeFlipable@@QBE?AW4Side@1@XZ @ 2677 NONAME ; enum QDeclarativeFlipable::Side QDeclarativeFlipable::side(void) const
 	?sideChanged@QDeclarativeFlipable@@IAEXXZ @ 2678 NONAME ; void QDeclarativeFlipable::sideChanged(void)
 	?signalOffset@QDeclarativeOpenMetaObjectType@@QBEHXZ @ 2679 NONAME ; int QDeclarativeOpenMetaObjectType::signalOffset(void) const
 	?signature@QMetaMethodBuilder@@QBE?AVQByteArray@@XZ @ 2680 NONAME ; class QByteArray QMetaMethodBuilder::signature(void) const
 	?size@QDeclarativePropertyMap@@QBEHXZ @ 2681 NONAME ; int QDeclarativePropertyMap::size(void) const
-	?sizeChange@QDeclarativeGridView@@AAEXXZ @ 2682 NONAME ; void QDeclarativeGridView::sizeChange(void)
+	?sizeChange@QDeclarativeGridView@@AAEXXZ @ 2682 NONAME ABSENT ; void QDeclarativeGridView::sizeChange(void)
 	?sizeChanged@QDeclarativeView@@AAEXXZ @ 2683 NONAME ; void QDeclarativeView::sizeChanged(void)
 	?sizeFFromString@QDeclarativeStringConverters@@YA?AVQSizeF@@ABVQString@@PA_N@Z @ 2684 NONAME ; class QSizeF QDeclarativeStringConverters::sizeFFromString(class QString const &, bool *)
 	?sizeHint@QDeclarativeView@@UBE?AVQSize@@XZ @ 2685 NONAME ; class QSize QDeclarativeView::sizeHint(void) const
 	?smooth@QDeclarativeItem@@QBE_NXZ @ 2686 NONAME ; bool QDeclarativeItem::smooth(void) const
 	?smoothCache@QDeclarativePaintedItem@@QBE_NXZ @ 2687 NONAME ; bool QDeclarativePaintedItem::smoothCache(void) const
-	?smoothChanged@QDeclarativeItem@@IAEXXZ @ 2688 NONAME ; void QDeclarativeItem::smoothChanged(void)
+	?smoothChanged@QDeclarativeItem@@IAEXXZ @ 2688 NONAME ABSENT ; void QDeclarativeItem::smoothChanged(void)
 	?snapMode@QDeclarativeListView@@QBE?AW4SnapMode@1@XZ @ 2689 NONAME ; enum QDeclarativeListView::SnapMode QDeclarativeListView::snapMode(void) const
-	?snapPosition@QDeclarativePathView@@QBEMXZ @ 2690 NONAME ; float QDeclarativePathView::snapPosition(void) const
+	?snapPosition@QDeclarativePathView@@QBEMXZ @ 2690 NONAME ABSENT ; float QDeclarativePathView::snapPosition(void) const
 	?source@QDeclarativeDebugObjectReference@@QBE?AVQDeclarativeDebugFileReference@@XZ @ 2691 NONAME ; class QDeclarativeDebugFileReference QDeclarativeDebugObjectReference::source(void) const
 	?source@QDeclarativeFontLoader@@QBE?AVQUrl@@XZ @ 2692 NONAME ; class QUrl QDeclarativeFontLoader::source(void) const
 	?source@QDeclarativeImageBase@@QBE?AVQUrl@@XZ @ 2693 NONAME ; class QUrl QDeclarativeImageBase::source(void) const
 	?source@QDeclarativeLoader@@QBE?AVQUrl@@XZ @ 2694 NONAME ; class QUrl QDeclarativeLoader::source(void) const
-	?source@QDeclarativeParticles@@QBE?AVQUrl@@XZ @ 2695 NONAME ; class QUrl QDeclarativeParticles::source(void) const
+	?source@QDeclarativeParticles@@QBE?AVQUrl@@XZ @ 2695 NONAME ABSENT ; class QUrl QDeclarativeParticles::source(void) const
 	?source@QDeclarativeView@@QBE?AVQUrl@@XZ @ 2696 NONAME ; class QUrl QDeclarativeView::source(void) const
 	?source@QDeclarativeXmlListModel@@QBE?AVQUrl@@XZ @ 2697 NONAME ; class QUrl QDeclarativeXmlListModel::source(void) const
-	?sourceChanged@QDeclarativeEaseFollow@@IAEXXZ @ 2698 NONAME ; void QDeclarativeEaseFollow::sourceChanged(void)
+	?sourceChanged@QDeclarativeEaseFollow@@IAEXXZ @ 2698 NONAME ABSENT ; void QDeclarativeEaseFollow::sourceChanged(void)
 	?sourceChanged@QDeclarativeImageBase@@IAEXABVQUrl@@@Z @ 2699 NONAME ; void QDeclarativeImageBase::sourceChanged(class QUrl const &)
 	?sourceChanged@QDeclarativeLoader@@IAEXXZ @ 2700 NONAME ; void QDeclarativeLoader::sourceChanged(void)
-	?sourceChanged@QDeclarativeParticles@@IAEXXZ @ 2701 NONAME ; void QDeclarativeParticles::sourceChanged(void)
+	?sourceChanged@QDeclarativeParticles@@IAEXXZ @ 2701 NONAME ABSENT ; void QDeclarativeParticles::sourceChanged(void)
 	?sourceComponent@QDeclarativeLoader@@QBEPAVQDeclarativeComponent@@XZ @ 2702 NONAME ; class QDeclarativeComponent * QDeclarativeLoader::sourceComponent(void) const
 	?sourceFile@QDeclarativeExpression@@QBE?AVQString@@XZ @ 2703 NONAME ; class QString QDeclarativeExpression::sourceFile(void) const
-	?sourceValue@QDeclarativeEaseFollow@@QBEMXZ @ 2704 NONAME ; float QDeclarativeEaseFollow::sourceValue(void) const
+	?sourceValue@QDeclarativeEaseFollow@@QBEMXZ @ 2704 NONAME ABSENT ; float QDeclarativeEaseFollow::sourceValue(void) const
 	?sourceValue@QDeclarativeSpringFollow@@QBEMXZ @ 2705 NONAME ; float QDeclarativeSpringFollow::sourceValue(void) const
 	?spacing@QDeclarativeBasePositioner@@QBEHXZ @ 2706 NONAME ; int QDeclarativeBasePositioner::spacing(void) const
 	?spacing@QDeclarativeListView@@QBEMXZ @ 2707 NONAME ; float QDeclarativeListView::spacing(void) const
@@ -2721,9 +2721,9 @@ EXPORTS
 	?stateChanged@QDeclarativeItem@@IAEXABVQString@@@Z @ 2720 NONAME ; void QDeclarativeItem::stateChanged(class QString const &)
 	?stateChanged@QDeclarativeStateGroup@@IAEXABVQString@@@Z @ 2721 NONAME ; void QDeclarativeStateGroup::stateChanged(class QString const &)
 	?stateGroup@QDeclarativeState@@QBEPAVQDeclarativeStateGroup@@XZ @ 2722 NONAME ; class QDeclarativeStateGroup * QDeclarativeState::stateGroup(void) const
-	?states@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 2723 NONAME ; struct QDeclarativeListProperty<class QDeclarativeState> QDeclarativeItem::states(void)
+	?states@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 2723 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativeState> QDeclarativeItem::states(void)
 	?states@QDeclarativeStateGroup@@QBE?AV?$QList@PAVQDeclarativeState@@@@XZ @ 2724 NONAME ; class QList<class QDeclarativeState *> QDeclarativeStateGroup::states(void) const
-	?statesProperty@QDeclarativeStateGroup@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 2725 NONAME ; struct QDeclarativeListProperty<class QDeclarativeState> QDeclarativeStateGroup::statesProperty(void)
+	?statesProperty@QDeclarativeStateGroup@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 2725 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativeState> QDeclarativeStateGroup::statesProperty(void)
 	?staticMetacallFunction@QMetaObjectBuilder@@QBEP6AHW4Call@QMetaObject@@HPAPAX@ZXZ @ 2726 NONAME ; int (*)(enum QMetaObject::Call, int, void * *) QMetaObjectBuilder::staticMetacallFunction(void) const
 	?status@QDeclarativeComponent@@QBE?AW4Status@1@XZ @ 2727 NONAME ; enum QDeclarativeComponent::Status QDeclarativeComponent::status(void) const
 	?status@QDeclarativeFontLoader@@QBE?AW4Status@1@XZ @ 2728 NONAME ; enum QDeclarativeFontLoader::Status QDeclarativeFontLoader::status(void) const
@@ -2731,21 +2731,21 @@ EXPORTS
 	?status@QDeclarativeLoader@@QBE?AW4Status@1@XZ @ 2730 NONAME ; enum QDeclarativeLoader::Status QDeclarativeLoader::status(void) const
 	?status@QDeclarativePixmapReply@@QBE?AW4Status@1@XZ @ 2731 NONAME ; enum QDeclarativePixmapReply::Status QDeclarativePixmapReply::status(void) const
 	?status@QDeclarativeView@@QBE?AW4Status@1@XZ @ 2732 NONAME ; enum QDeclarativeView::Status QDeclarativeView::status(void) const
-	?status@QDeclarativeWebView@@QBE?AW4Status@1@XZ @ 2733 NONAME ; enum QDeclarativeWebView::Status QDeclarativeWebView::status(void) const
+	?status@QDeclarativeWebView@@QBE?AW4Status@1@XZ @ 2733 NONAME ABSENT ; enum QDeclarativeWebView::Status QDeclarativeWebView::status(void) const
 	?status@QDeclarativeXmlListModel@@QBE?AW4Status@1@XZ @ 2734 NONAME ; enum QDeclarativeXmlListModel::Status QDeclarativeXmlListModel::status(void) const
 	?statusChanged@QDeclarativeComponent@@IAEXW4Status@1@@Z @ 2735 NONAME ; void QDeclarativeComponent::statusChanged(enum QDeclarativeComponent::Status)
 	?statusChanged@QDeclarativeFontLoader@@IAEXXZ @ 2736 NONAME ; void QDeclarativeFontLoader::statusChanged(void)
 	?statusChanged@QDeclarativeImageBase@@IAEXW4Status@1@@Z @ 2737 NONAME ; void QDeclarativeImageBase::statusChanged(enum QDeclarativeImageBase::Status)
 	?statusChanged@QDeclarativeLoader@@IAEXXZ @ 2738 NONAME ; void QDeclarativeLoader::statusChanged(void)
 	?statusChanged@QDeclarativeView@@IAEXW4Status@1@@Z @ 2739 NONAME ; void QDeclarativeView::statusChanged(enum QDeclarativeView::Status)
-	?statusChanged@QDeclarativeWebView@@IAEXW4Status@1@@Z @ 2740 NONAME ; void QDeclarativeWebView::statusChanged(enum QDeclarativeWebView::Status)
+	?statusChanged@QDeclarativeWebView@@IAEXW4Status@1@@Z @ 2740 NONAME ABSENT ; void QDeclarativeWebView::statusChanged(enum QDeclarativeWebView::Status)
 	?statusChanged@QDeclarativeXmlListModel@@IAEXW4Status@1@@Z @ 2741 NONAME ; void QDeclarativeXmlListModel::statusChanged(enum QDeclarativeXmlListModel::Status)
-	?statusText@QDeclarativeWebView@@QBE?AVQString@@XZ @ 2742 NONAME ; class QString QDeclarativeWebView::statusText(void) const
-	?statusTextChanged@QDeclarativeWebView@@IAEXXZ @ 2743 NONAME ; void QDeclarativeWebView::statusTextChanged(void)
+	?statusText@QDeclarativeWebView@@QBE?AVQString@@XZ @ 2742 NONAME ABSENT ; class QString QDeclarativeWebView::statusText(void) const
+	?statusTextChanged@QDeclarativeWebView@@IAEXXZ @ 2743 NONAME ABSENT ; void QDeclarativeWebView::statusTextChanged(void)
 	?stop@QDeclarativeTimer@@QAEXXZ @ 2744 NONAME ; void QDeclarativeTimer::stop(void)
 	?stop@QDeclarativeTransition@@QAEXXZ @ 2745 NONAME ; void QDeclarativeTransition::stop(void)
-	?stopAction@QDeclarativeWebView@@QBEPAVQAction@@XZ @ 2746 NONAME ; class QAction * QDeclarativeWebView::stopAction(void) const
-	?stops@QDeclarativeGradient@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeGradientStop@@@@XZ @ 2747 NONAME ; struct QDeclarativeListProperty<class QDeclarativeGradientStop> QDeclarativeGradient::stops(void)
+	?stopAction@QDeclarativeWebView@@QBEPAVQAction@@XZ @ 2746 NONAME ABSENT ; class QAction * QDeclarativeWebView::stopAction(void) const
+	?stops@QDeclarativeGradient@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeGradientStop@@@@XZ @ 2747 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativeGradientStop> QDeclarativeGradient::stops(void)
 	?stringToRule@QDeclarativeGridScaledImage@@CA?AW4TileMode@QDeclarativeBorderImage@@ABVQString@@@Z @ 2748 NONAME ; enum QDeclarativeBorderImage::TileMode QDeclarativeGridScaledImage::stringToRule(class QString const &)
 	?stringValue@QDeclarativeVisualDataModel@@UAE?AVQString@@HABV2@@Z @ 2749 NONAME ; class QString QDeclarativeVisualDataModel::stringValue(int, class QString const &)
 	?stringValue@QDeclarativeVisualItemModel@@UAE?AVQString@@HABV2@@Z @ 2750 NONAME ; class QString QDeclarativeVisualItemModel::stringValue(int, class QString const &)
@@ -2759,18 +2759,18 @@ EXPORTS
 	?synchronizedResizing@QDeclarativeGraphicsObjectContainer@@QBE_NXZ @ 2758 NONAME ; bool QDeclarativeGraphicsObjectContainer::synchronizedResizing(void) const
 	?tag@QMetaMethodBuilder@@QBE?AVQByteArray@@XZ @ 2759 NONAME ; class QByteArray QMetaMethodBuilder::tag(void) const
 	?target@QDeclarativeConnections@@QBEPAVQObject@@XZ @ 2760 NONAME ; class QObject * QDeclarativeConnections::target(void) const
-	?target@QDeclarativeDrag@@QBEPAVQDeclarativeItem@@XZ @ 2761 NONAME ; class QDeclarativeItem * QDeclarativeDrag::target(void) const
+	?target@QDeclarativeDrag@@QBEPAVQDeclarativeItem@@XZ @ 2761 NONAME ABSENT ; class QDeclarativeItem * QDeclarativeDrag::target(void) const
 	?targetChanged@QDeclarativeConnections@@IAEXXZ @ 2762 NONAME ; void QDeclarativeConnections::targetChanged(void)
 	?targetChanged@QDeclarativeDrag@@IAEXXZ @ 2763 NONAME ; void QDeclarativeDrag::targetChanged(void)
 	?testLiteralAssignment@QDeclarativeCompiler@@AAE_NABVQMetaProperty@@PAVValue@QDeclarativeParser@@@Z @ 2764 NONAME ; bool QDeclarativeCompiler::testLiteralAssignment(class QMetaProperty const &, class QDeclarativeParser::Value *)
 	?testQualifiedEnumAssignment@QDeclarativeCompiler@@AAE_NABVQMetaProperty@@PAVObject@QDeclarativeParser@@PAVValue@4@PA_N@Z @ 2765 NONAME ; bool QDeclarativeCompiler::testQualifiedEnumAssignment(class QMetaProperty const &, class QDeclarativeParser::Object *, class QDeclarativeParser::Value *, bool *)
-	?text@QDeclarativeNumberFormatter@@QBE?AVQString@@XZ @ 2766 NONAME ; class QString QDeclarativeNumberFormatter::text(void) const
+	?text@QDeclarativeNumberFormatter@@QBE?AVQString@@XZ @ 2766 NONAME ABSENT ; class QString QDeclarativeNumberFormatter::text(void) const
 	?text@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 2767 NONAME ; class QColor QDeclarativeSystemPalette::text(void) const
 	?text@QDeclarativeText@@QBE?AVQString@@XZ @ 2768 NONAME ; class QString QDeclarativeText::text(void) const
 	?text@QDeclarativeTextEdit@@QBE?AVQString@@XZ @ 2769 NONAME ; class QString QDeclarativeTextEdit::text(void) const
 	?text@QDeclarativeTextInput@@QBE?AVQString@@XZ @ 2770 NONAME ; class QString QDeclarativeTextInput::text(void) const
-	?textChanged@QDeclarativeDateTimeFormatter@@IAEXXZ @ 2771 NONAME ; void QDeclarativeDateTimeFormatter::textChanged(void)
-	?textChanged@QDeclarativeNumberFormatter@@IAEXXZ @ 2772 NONAME ; void QDeclarativeNumberFormatter::textChanged(void)
+	?textChanged@QDeclarativeDateTimeFormatter@@IAEXXZ @ 2771 NONAME ABSENT ; void QDeclarativeDateTimeFormatter::textChanged(void)
+	?textChanged@QDeclarativeNumberFormatter@@IAEXXZ @ 2772 NONAME ABSENT ; void QDeclarativeNumberFormatter::textChanged(void)
 	?textChanged@QDeclarativeText@@IAEXABVQString@@@Z @ 2773 NONAME ; void QDeclarativeText::textChanged(class QString const &)
 	?textChanged@QDeclarativeTextEdit@@IAEXABVQString@@@Z @ 2774 NONAME ; void QDeclarativeTextEdit::textChanged(class QString const &)
 	?textChanged@QDeclarativeTextInput@@IAEXXZ @ 2775 NONAME ; void QDeclarativeTextInput::textChanged(void)
@@ -2784,16 +2784,16 @@ EXPORTS
 	?ticked@QDeclarativeFlickable@@MAEXXZ @ 2783 NONAME ; void QDeclarativeFlickable::ticked(void)
 	?ticked@QDeclarativePathView@@AAEXXZ @ 2784 NONAME ; void QDeclarativePathView::ticked(void)
 	?ticked@QDeclarativeTimer@@AAEXXZ @ 2785 NONAME ; void QDeclarativeTimer::ticked(void)
-	?time@QDeclarativeDateTimeFormatter@@QBE?AVQTime@@XZ @ 2786 NONAME ; class QTime QDeclarativeDateTimeFormatter::time(void) const
-	?timeFormat@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 2787 NONAME ; class QString QDeclarativeDateTimeFormatter::timeFormat(void) const
+	?time@QDeclarativeDateTimeFormatter@@QBE?AVQTime@@XZ @ 2786 NONAME ABSENT ; class QTime QDeclarativeDateTimeFormatter::time(void) const
+	?timeFormat@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 2787 NONAME ABSENT ; class QString QDeclarativeDateTimeFormatter::timeFormat(void) const
 	?timeFromString@QDeclarativeStringConverters@@YA?AVQTime@@ABVQString@@PA_N@Z @ 2788 NONAME ; class QTime QDeclarativeStringConverters::timeFromString(class QString const &, bool *)
-	?timeText@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 2789 NONAME ; class QString QDeclarativeDateTimeFormatter::timeText(void) const
+	?timeText@QDeclarativeDateTimeFormatter@@QBE?AVQString@@XZ @ 2789 NONAME ABSENT ; class QString QDeclarativeDateTimeFormatter::timeText(void) const
 	?timerEvent@QDeclarativeFlickable@@MAEXPAVQTimerEvent@@@Z @ 2790 NONAME ; void QDeclarativeFlickable::timerEvent(class QTimerEvent *)
 	?timerEvent@QDeclarativeMouseArea@@MAEXPAVQTimerEvent@@@Z @ 2791 NONAME ; void QDeclarativeMouseArea::timerEvent(class QTimerEvent *)
 	?timerEvent@QDeclarativeView@@MAEXPAVQTimerEvent@@@Z @ 2792 NONAME ; void QDeclarativeView::timerEvent(class QTimerEvent *)
-	?timerEvent@QDeclarativeWebView@@MAEXPAVQTimerEvent@@@Z @ 2793 NONAME ; void QDeclarativeWebView::timerEvent(class QTimerEvent *)
-	?title@QDeclarativeWebView@@QBE?AVQString@@XZ @ 2794 NONAME ; class QString QDeclarativeWebView::title(void) const
-	?titleChanged@QDeclarativeWebView@@IAEXABVQString@@@Z @ 2795 NONAME ; void QDeclarativeWebView::titleChanged(class QString const &)
+	?timerEvent@QDeclarativeWebView@@MAEXPAVQTimerEvent@@@Z @ 2793 NONAME ABSENT ; void QDeclarativeWebView::timerEvent(class QTimerEvent *)
+	?title@QDeclarativeWebView@@QBE?AVQString@@XZ @ 2794 NONAME ABSENT ; class QString QDeclarativeWebView::title(void) const
+	?titleChanged@QDeclarativeWebView@@IAEXABVQString@@@Z @ 2795 NONAME ABSENT ; void QDeclarativeWebView::titleChanged(class QString const &)
 	?toBinding@QDeclarativeDomValue@@QBE?AVQDeclarativeDomValueBinding@@XZ @ 2796 NONAME ; class QDeclarativeDomValueBinding QDeclarativeDomValue::toBinding(void) const
 	?toComponent@QDeclarativeDomObject@@QBE?AVQDeclarativeDomComponent@@XZ @ 2797 NONAME ; class QDeclarativeDomComponent QDeclarativeDomObject::toComponent(void) const
 	?toList@QDeclarativeDomValue@@QBE?AVQDeclarativeDomList@@XZ @ 2798 NONAME ; class QDeclarativeDomList QDeclarativeDomValue::toList(void) const
@@ -2809,9 +2809,9 @@ EXPORTS
 	?toString@QDeclarativeXmlListModel@@UBE?AVQString@@H@Z @ 2808 NONAME ; class QString QDeclarativeXmlListModel::toString(int) const
 	?toValueInterceptor@QDeclarativeDomValue@@QBE?AVQDeclarativeDomValueValueInterceptor@@XZ @ 2809 NONAME ; class QDeclarativeDomValueValueInterceptor QDeclarativeDomValue::toValueInterceptor(void) const
 	?toValueSource@QDeclarativeDomValue@@QBE?AVQDeclarativeDomValueValueSource@@XZ @ 2810 NONAME ; class QDeclarativeDomValueValueSource QDeclarativeDomValue::toValueSource(void) const
-	?top@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2811 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::top(void) const
-	?top@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2812 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchors::top(void) const
-	?top@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2813 NONAME ; class QDeclarativeAnchorLine QDeclarativeItem::top(void) const
+	?top@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2811 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::top(void) const
+	?top@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2812 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchors::top(void) const
+	?top@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 2813 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeItem::top(void) const
 	?top@QDeclarativeScaleGrid@@QBEHXZ @ 2814 NONAME ; int QDeclarativeScaleGrid::top(void) const
 	?topChanged@QDeclarativeAnchors@@IAEXXZ @ 2815 NONAME ; void QDeclarativeAnchors::topChanged(void)
 	?topMargin@QDeclarativeAnchors@@QBEMXZ @ 2816 NONAME ; float QDeclarativeAnchors::topMargin(void) const
@@ -2840,8 +2840,8 @@ EXPORTS
 	?tr@QDeclarativeContext@@SA?AVQString@@PBD0H@Z @ 2839 NONAME ; class QString QDeclarativeContext::tr(char const *, char const *, int)
 	?tr@QDeclarativeCurve@@SA?AVQString@@PBD0@Z @ 2840 NONAME ; class QString QDeclarativeCurve::tr(char const *, char const *)
 	?tr@QDeclarativeCurve@@SA?AVQString@@PBD0H@Z @ 2841 NONAME ; class QString QDeclarativeCurve::tr(char const *, char const *, int)
-	?tr@QDeclarativeDateTimeFormatter@@SA?AVQString@@PBD0@Z @ 2842 NONAME ; class QString QDeclarativeDateTimeFormatter::tr(char const *, char const *)
-	?tr@QDeclarativeDateTimeFormatter@@SA?AVQString@@PBD0H@Z @ 2843 NONAME ; class QString QDeclarativeDateTimeFormatter::tr(char const *, char const *, int)
+	?tr@QDeclarativeDateTimeFormatter@@SA?AVQString@@PBD0@Z @ 2842 NONAME ABSENT ; class QString QDeclarativeDateTimeFormatter::tr(char const *, char const *)
+	?tr@QDeclarativeDateTimeFormatter@@SA?AVQString@@PBD0H@Z @ 2843 NONAME ABSENT ; class QString QDeclarativeDateTimeFormatter::tr(char const *, char const *, int)
 	?tr@QDeclarativeDebugClient@@SA?AVQString@@PBD0@Z @ 2844 NONAME ; class QString QDeclarativeDebugClient::tr(char const *, char const *)
 	?tr@QDeclarativeDebugClient@@SA?AVQString@@PBD0H@Z @ 2845 NONAME ; class QString QDeclarativeDebugClient::tr(char const *, char const *, int)
 	?tr@QDeclarativeDebugConnection@@SA?AVQString@@PBD0@Z @ 2846 NONAME ; class QString QDeclarativeDebugConnection::tr(char const *, char const *)
@@ -2866,8 +2866,8 @@ EXPORTS
 	?tr@QDeclarativeDebugWatch@@SA?AVQString@@PBD0H@Z @ 2865 NONAME ; class QString QDeclarativeDebugWatch::tr(char const *, char const *, int)
 	?tr@QDeclarativeDrag@@SA?AVQString@@PBD0@Z @ 2866 NONAME ; class QString QDeclarativeDrag::tr(char const *, char const *)
 	?tr@QDeclarativeDrag@@SA?AVQString@@PBD0H@Z @ 2867 NONAME ; class QString QDeclarativeDrag::tr(char const *, char const *, int)
-	?tr@QDeclarativeEaseFollow@@SA?AVQString@@PBD0@Z @ 2868 NONAME ; class QString QDeclarativeEaseFollow::tr(char const *, char const *)
-	?tr@QDeclarativeEaseFollow@@SA?AVQString@@PBD0H@Z @ 2869 NONAME ; class QString QDeclarativeEaseFollow::tr(char const *, char const *, int)
+	?tr@QDeclarativeEaseFollow@@SA?AVQString@@PBD0@Z @ 2868 NONAME ABSENT ; class QString QDeclarativeEaseFollow::tr(char const *, char const *)
+	?tr@QDeclarativeEaseFollow@@SA?AVQString@@PBD0H@Z @ 2869 NONAME ABSENT ; class QString QDeclarativeEaseFollow::tr(char const *, char const *, int)
 	?tr@QDeclarativeEngine@@SA?AVQString@@PBD0@Z @ 2870 NONAME ; class QString QDeclarativeEngine::tr(char const *, char const *)
 	?tr@QDeclarativeEngine@@SA?AVQString@@PBD0H@Z @ 2871 NONAME ; class QString QDeclarativeEngine::tr(char const *, char const *, int)
 	?tr@QDeclarativeEngineDebug@@SA?AVQString@@PBD0@Z @ 2872 NONAME ; class QString QDeclarativeEngineDebug::tr(char const *, char const *)
@@ -2912,22 +2912,22 @@ EXPORTS
 	?tr@QDeclarativeLoader@@SA?AVQString@@PBD0H@Z @ 2911 NONAME ; class QString QDeclarativeLoader::tr(char const *, char const *, int)
 	?tr@QDeclarativeMouseArea@@SA?AVQString@@PBD0@Z @ 2912 NONAME ; class QString QDeclarativeMouseArea::tr(char const *, char const *)
 	?tr@QDeclarativeMouseArea@@SA?AVQString@@PBD0H@Z @ 2913 NONAME ; class QString QDeclarativeMouseArea::tr(char const *, char const *, int)
-	?tr@QDeclarativeNumberFormatter@@SA?AVQString@@PBD0@Z @ 2914 NONAME ; class QString QDeclarativeNumberFormatter::tr(char const *, char const *)
-	?tr@QDeclarativeNumberFormatter@@SA?AVQString@@PBD0H@Z @ 2915 NONAME ; class QString QDeclarativeNumberFormatter::tr(char const *, char const *, int)
+	?tr@QDeclarativeNumberFormatter@@SA?AVQString@@PBD0@Z @ 2914 NONAME ABSENT ; class QString QDeclarativeNumberFormatter::tr(char const *, char const *)
+	?tr@QDeclarativeNumberFormatter@@SA?AVQString@@PBD0H@Z @ 2915 NONAME ABSENT ; class QString QDeclarativeNumberFormatter::tr(char const *, char const *, int)
 	?tr@QDeclarativePaintedItem@@SA?AVQString@@PBD0@Z @ 2916 NONAME ; class QString QDeclarativePaintedItem::tr(char const *, char const *)
 	?tr@QDeclarativePaintedItem@@SA?AVQString@@PBD0H@Z @ 2917 NONAME ; class QString QDeclarativePaintedItem::tr(char const *, char const *, int)
 	?tr@QDeclarativeParentChange@@SA?AVQString@@PBD0@Z @ 2918 NONAME ; class QString QDeclarativeParentChange::tr(char const *, char const *)
 	?tr@QDeclarativeParentChange@@SA?AVQString@@PBD0H@Z @ 2919 NONAME ; class QString QDeclarativeParentChange::tr(char const *, char const *, int)
-	?tr@QDeclarativeParticleMotion@@SA?AVQString@@PBD0@Z @ 2920 NONAME ; class QString QDeclarativeParticleMotion::tr(char const *, char const *)
-	?tr@QDeclarativeParticleMotion@@SA?AVQString@@PBD0H@Z @ 2921 NONAME ; class QString QDeclarativeParticleMotion::tr(char const *, char const *, int)
-	?tr@QDeclarativeParticleMotionGravity@@SA?AVQString@@PBD0@Z @ 2922 NONAME ; class QString QDeclarativeParticleMotionGravity::tr(char const *, char const *)
-	?tr@QDeclarativeParticleMotionGravity@@SA?AVQString@@PBD0H@Z @ 2923 NONAME ; class QString QDeclarativeParticleMotionGravity::tr(char const *, char const *, int)
-	?tr@QDeclarativeParticleMotionLinear@@SA?AVQString@@PBD0@Z @ 2924 NONAME ; class QString QDeclarativeParticleMotionLinear::tr(char const *, char const *)
-	?tr@QDeclarativeParticleMotionLinear@@SA?AVQString@@PBD0H@Z @ 2925 NONAME ; class QString QDeclarativeParticleMotionLinear::tr(char const *, char const *, int)
-	?tr@QDeclarativeParticleMotionWander@@SA?AVQString@@PBD0@Z @ 2926 NONAME ; class QString QDeclarativeParticleMotionWander::tr(char const *, char const *)
-	?tr@QDeclarativeParticleMotionWander@@SA?AVQString@@PBD0H@Z @ 2927 NONAME ; class QString QDeclarativeParticleMotionWander::tr(char const *, char const *, int)
-	?tr@QDeclarativeParticles@@SA?AVQString@@PBD0@Z @ 2928 NONAME ; class QString QDeclarativeParticles::tr(char const *, char const *)
-	?tr@QDeclarativeParticles@@SA?AVQString@@PBD0H@Z @ 2929 NONAME ; class QString QDeclarativeParticles::tr(char const *, char const *, int)
+	?tr@QDeclarativeParticleMotion@@SA?AVQString@@PBD0@Z @ 2920 NONAME ABSENT ; class QString QDeclarativeParticleMotion::tr(char const *, char const *)
+	?tr@QDeclarativeParticleMotion@@SA?AVQString@@PBD0H@Z @ 2921 NONAME ABSENT ; class QString QDeclarativeParticleMotion::tr(char const *, char const *, int)
+	?tr@QDeclarativeParticleMotionGravity@@SA?AVQString@@PBD0@Z @ 2922 NONAME ABSENT ; class QString QDeclarativeParticleMotionGravity::tr(char const *, char const *)
+	?tr@QDeclarativeParticleMotionGravity@@SA?AVQString@@PBD0H@Z @ 2923 NONAME ABSENT ; class QString QDeclarativeParticleMotionGravity::tr(char const *, char const *, int)
+	?tr@QDeclarativeParticleMotionLinear@@SA?AVQString@@PBD0@Z @ 2924 NONAME ABSENT ; class QString QDeclarativeParticleMotionLinear::tr(char const *, char const *)
+	?tr@QDeclarativeParticleMotionLinear@@SA?AVQString@@PBD0H@Z @ 2925 NONAME ABSENT ; class QString QDeclarativeParticleMotionLinear::tr(char const *, char const *, int)
+	?tr@QDeclarativeParticleMotionWander@@SA?AVQString@@PBD0@Z @ 2926 NONAME ABSENT ; class QString QDeclarativeParticleMotionWander::tr(char const *, char const *)
+	?tr@QDeclarativeParticleMotionWander@@SA?AVQString@@PBD0H@Z @ 2927 NONAME ABSENT ; class QString QDeclarativeParticleMotionWander::tr(char const *, char const *, int)
+	?tr@QDeclarativeParticles@@SA?AVQString@@PBD0@Z @ 2928 NONAME ABSENT ; class QString QDeclarativeParticles::tr(char const *, char const *)
+	?tr@QDeclarativeParticles@@SA?AVQString@@PBD0H@Z @ 2929 NONAME ABSENT ; class QString QDeclarativeParticles::tr(char const *, char const *, int)
 	?tr@QDeclarativePath@@SA?AVQString@@PBD0@Z @ 2930 NONAME ; class QString QDeclarativePath::tr(char const *, char const *)
 	?tr@QDeclarativePath@@SA?AVQString@@PBD0H@Z @ 2931 NONAME ; class QString QDeclarativePath::tr(char const *, char const *, int)
 	?tr@QDeclarativePathAttribute@@SA?AVQString@@PBD0@Z @ 2932 NONAME ; class QString QDeclarativePathAttribute::tr(char const *, char const *)
@@ -2994,10 +2994,10 @@ EXPORTS
 	?tr@QDeclarativeVisualItemModel@@SA?AVQString@@PBD0H@Z @ 2993 NONAME ; class QString QDeclarativeVisualItemModel::tr(char const *, char const *, int)
 	?tr@QDeclarativeVisualModel@@SA?AVQString@@PBD0@Z @ 2994 NONAME ; class QString QDeclarativeVisualModel::tr(char const *, char const *)
 	?tr@QDeclarativeVisualModel@@SA?AVQString@@PBD0H@Z @ 2995 NONAME ; class QString QDeclarativeVisualModel::tr(char const *, char const *, int)
-	?tr@QDeclarativeWebPage@@SA?AVQString@@PBD0@Z @ 2996 NONAME ; class QString QDeclarativeWebPage::tr(char const *, char const *)
-	?tr@QDeclarativeWebPage@@SA?AVQString@@PBD0H@Z @ 2997 NONAME ; class QString QDeclarativeWebPage::tr(char const *, char const *, int)
-	?tr@QDeclarativeWebView@@SA?AVQString@@PBD0@Z @ 2998 NONAME ; class QString QDeclarativeWebView::tr(char const *, char const *)
-	?tr@QDeclarativeWebView@@SA?AVQString@@PBD0H@Z @ 2999 NONAME ; class QString QDeclarativeWebView::tr(char const *, char const *, int)
+	?tr@QDeclarativeWebPage@@SA?AVQString@@PBD0@Z @ 2996 NONAME ABSENT ; class QString QDeclarativeWebPage::tr(char const *, char const *)
+	?tr@QDeclarativeWebPage@@SA?AVQString@@PBD0H@Z @ 2997 NONAME ABSENT ; class QString QDeclarativeWebPage::tr(char const *, char const *, int)
+	?tr@QDeclarativeWebView@@SA?AVQString@@PBD0@Z @ 2998 NONAME ABSENT ; class QString QDeclarativeWebView::tr(char const *, char const *)
+	?tr@QDeclarativeWebView@@SA?AVQString@@PBD0H@Z @ 2999 NONAME ABSENT ; class QString QDeclarativeWebView::tr(char const *, char const *, int)
 	?tr@QDeclarativeXmlListModel@@SA?AVQString@@PBD0@Z @ 3000 NONAME ; class QString QDeclarativeXmlListModel::tr(char const *, char const *)
 	?tr@QDeclarativeXmlListModel@@SA?AVQString@@PBD0H@Z @ 3001 NONAME ; class QString QDeclarativeXmlListModel::tr(char const *, char const *, int)
 	?tr@QDeclarativeXmlListModelRole@@SA?AVQString@@PBD0@Z @ 3002 NONAME ; class QString QDeclarativeXmlListModelRole::tr(char const *, char const *)
@@ -3030,8 +3030,8 @@ EXPORTS
 	?trUtf8@QDeclarativeContext@@SA?AVQString@@PBD0H@Z @ 3029 NONAME ; class QString QDeclarativeContext::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeCurve@@SA?AVQString@@PBD0@Z @ 3030 NONAME ; class QString QDeclarativeCurve::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativeCurve@@SA?AVQString@@PBD0H@Z @ 3031 NONAME ; class QString QDeclarativeCurve::trUtf8(char const *, char const *, int)
-	?trUtf8@QDeclarativeDateTimeFormatter@@SA?AVQString@@PBD0@Z @ 3032 NONAME ; class QString QDeclarativeDateTimeFormatter::trUtf8(char const *, char const *)
-	?trUtf8@QDeclarativeDateTimeFormatter@@SA?AVQString@@PBD0H@Z @ 3033 NONAME ; class QString QDeclarativeDateTimeFormatter::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeDateTimeFormatter@@SA?AVQString@@PBD0@Z @ 3032 NONAME ABSENT ; class QString QDeclarativeDateTimeFormatter::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeDateTimeFormatter@@SA?AVQString@@PBD0H@Z @ 3033 NONAME ABSENT ; class QString QDeclarativeDateTimeFormatter::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeDebugClient@@SA?AVQString@@PBD0@Z @ 3034 NONAME ; class QString QDeclarativeDebugClient::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativeDebugClient@@SA?AVQString@@PBD0H@Z @ 3035 NONAME ; class QString QDeclarativeDebugClient::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeDebugConnection@@SA?AVQString@@PBD0@Z @ 3036 NONAME ; class QString QDeclarativeDebugConnection::trUtf8(char const *, char const *)
@@ -3056,8 +3056,8 @@ EXPORTS
 	?trUtf8@QDeclarativeDebugWatch@@SA?AVQString@@PBD0H@Z @ 3055 NONAME ; class QString QDeclarativeDebugWatch::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeDrag@@SA?AVQString@@PBD0@Z @ 3056 NONAME ; class QString QDeclarativeDrag::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativeDrag@@SA?AVQString@@PBD0H@Z @ 3057 NONAME ; class QString QDeclarativeDrag::trUtf8(char const *, char const *, int)
-	?trUtf8@QDeclarativeEaseFollow@@SA?AVQString@@PBD0@Z @ 3058 NONAME ; class QString QDeclarativeEaseFollow::trUtf8(char const *, char const *)
-	?trUtf8@QDeclarativeEaseFollow@@SA?AVQString@@PBD0H@Z @ 3059 NONAME ; class QString QDeclarativeEaseFollow::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeEaseFollow@@SA?AVQString@@PBD0@Z @ 3058 NONAME ABSENT ; class QString QDeclarativeEaseFollow::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeEaseFollow@@SA?AVQString@@PBD0H@Z @ 3059 NONAME ABSENT ; class QString QDeclarativeEaseFollow::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeEngine@@SA?AVQString@@PBD0@Z @ 3060 NONAME ; class QString QDeclarativeEngine::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativeEngine@@SA?AVQString@@PBD0H@Z @ 3061 NONAME ; class QString QDeclarativeEngine::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeEngineDebug@@SA?AVQString@@PBD0@Z @ 3062 NONAME ; class QString QDeclarativeEngineDebug::trUtf8(char const *, char const *)
@@ -3102,22 +3102,22 @@ EXPORTS
 	?trUtf8@QDeclarativeLoader@@SA?AVQString@@PBD0H@Z @ 3101 NONAME ; class QString QDeclarativeLoader::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeMouseArea@@SA?AVQString@@PBD0@Z @ 3102 NONAME ; class QString QDeclarativeMouseArea::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativeMouseArea@@SA?AVQString@@PBD0H@Z @ 3103 NONAME ; class QString QDeclarativeMouseArea::trUtf8(char const *, char const *, int)
-	?trUtf8@QDeclarativeNumberFormatter@@SA?AVQString@@PBD0@Z @ 3104 NONAME ; class QString QDeclarativeNumberFormatter::trUtf8(char const *, char const *)
-	?trUtf8@QDeclarativeNumberFormatter@@SA?AVQString@@PBD0H@Z @ 3105 NONAME ; class QString QDeclarativeNumberFormatter::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeNumberFormatter@@SA?AVQString@@PBD0@Z @ 3104 NONAME ABSENT ; class QString QDeclarativeNumberFormatter::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeNumberFormatter@@SA?AVQString@@PBD0H@Z @ 3105 NONAME ABSENT ; class QString QDeclarativeNumberFormatter::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativePaintedItem@@SA?AVQString@@PBD0@Z @ 3106 NONAME ; class QString QDeclarativePaintedItem::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativePaintedItem@@SA?AVQString@@PBD0H@Z @ 3107 NONAME ; class QString QDeclarativePaintedItem::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeParentChange@@SA?AVQString@@PBD0@Z @ 3108 NONAME ; class QString QDeclarativeParentChange::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativeParentChange@@SA?AVQString@@PBD0H@Z @ 3109 NONAME ; class QString QDeclarativeParentChange::trUtf8(char const *, char const *, int)
-	?trUtf8@QDeclarativeParticleMotion@@SA?AVQString@@PBD0@Z @ 3110 NONAME ; class QString QDeclarativeParticleMotion::trUtf8(char const *, char const *)
-	?trUtf8@QDeclarativeParticleMotion@@SA?AVQString@@PBD0H@Z @ 3111 NONAME ; class QString QDeclarativeParticleMotion::trUtf8(char const *, char const *, int)
-	?trUtf8@QDeclarativeParticleMotionGravity@@SA?AVQString@@PBD0@Z @ 3112 NONAME ; class QString QDeclarativeParticleMotionGravity::trUtf8(char const *, char const *)
-	?trUtf8@QDeclarativeParticleMotionGravity@@SA?AVQString@@PBD0H@Z @ 3113 NONAME ; class QString QDeclarativeParticleMotionGravity::trUtf8(char const *, char const *, int)
-	?trUtf8@QDeclarativeParticleMotionLinear@@SA?AVQString@@PBD0@Z @ 3114 NONAME ; class QString QDeclarativeParticleMotionLinear::trUtf8(char const *, char const *)
-	?trUtf8@QDeclarativeParticleMotionLinear@@SA?AVQString@@PBD0H@Z @ 3115 NONAME ; class QString QDeclarativeParticleMotionLinear::trUtf8(char const *, char const *, int)
-	?trUtf8@QDeclarativeParticleMotionWander@@SA?AVQString@@PBD0@Z @ 3116 NONAME ; class QString QDeclarativeParticleMotionWander::trUtf8(char const *, char const *)
-	?trUtf8@QDeclarativeParticleMotionWander@@SA?AVQString@@PBD0H@Z @ 3117 NONAME ; class QString QDeclarativeParticleMotionWander::trUtf8(char const *, char const *, int)
-	?trUtf8@QDeclarativeParticles@@SA?AVQString@@PBD0@Z @ 3118 NONAME ; class QString QDeclarativeParticles::trUtf8(char const *, char const *)
-	?trUtf8@QDeclarativeParticles@@SA?AVQString@@PBD0H@Z @ 3119 NONAME ; class QString QDeclarativeParticles::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeParticleMotion@@SA?AVQString@@PBD0@Z @ 3110 NONAME ABSENT ; class QString QDeclarativeParticleMotion::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeParticleMotion@@SA?AVQString@@PBD0H@Z @ 3111 NONAME ABSENT ; class QString QDeclarativeParticleMotion::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeParticleMotionGravity@@SA?AVQString@@PBD0@Z @ 3112 NONAME ABSENT ; class QString QDeclarativeParticleMotionGravity::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeParticleMotionGravity@@SA?AVQString@@PBD0H@Z @ 3113 NONAME ABSENT ; class QString QDeclarativeParticleMotionGravity::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeParticleMotionLinear@@SA?AVQString@@PBD0@Z @ 3114 NONAME ABSENT ; class QString QDeclarativeParticleMotionLinear::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeParticleMotionLinear@@SA?AVQString@@PBD0H@Z @ 3115 NONAME ABSENT ; class QString QDeclarativeParticleMotionLinear::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeParticleMotionWander@@SA?AVQString@@PBD0@Z @ 3116 NONAME ABSENT ; class QString QDeclarativeParticleMotionWander::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeParticleMotionWander@@SA?AVQString@@PBD0H@Z @ 3117 NONAME ABSENT ; class QString QDeclarativeParticleMotionWander::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeParticles@@SA?AVQString@@PBD0@Z @ 3118 NONAME ABSENT ; class QString QDeclarativeParticles::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeParticles@@SA?AVQString@@PBD0H@Z @ 3119 NONAME ABSENT ; class QString QDeclarativeParticles::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativePath@@SA?AVQString@@PBD0@Z @ 3120 NONAME ; class QString QDeclarativePath::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativePath@@SA?AVQString@@PBD0H@Z @ 3121 NONAME ; class QString QDeclarativePath::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativePathAttribute@@SA?AVQString@@PBD0@Z @ 3122 NONAME ; class QString QDeclarativePathAttribute::trUtf8(char const *, char const *)
@@ -3184,10 +3184,10 @@ EXPORTS
 	?trUtf8@QDeclarativeVisualItemModel@@SA?AVQString@@PBD0H@Z @ 3183 NONAME ; class QString QDeclarativeVisualItemModel::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeVisualModel@@SA?AVQString@@PBD0@Z @ 3184 NONAME ; class QString QDeclarativeVisualModel::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativeVisualModel@@SA?AVQString@@PBD0H@Z @ 3185 NONAME ; class QString QDeclarativeVisualModel::trUtf8(char const *, char const *, int)
-	?trUtf8@QDeclarativeWebPage@@SA?AVQString@@PBD0@Z @ 3186 NONAME ; class QString QDeclarativeWebPage::trUtf8(char const *, char const *)
-	?trUtf8@QDeclarativeWebPage@@SA?AVQString@@PBD0H@Z @ 3187 NONAME ; class QString QDeclarativeWebPage::trUtf8(char const *, char const *, int)
-	?trUtf8@QDeclarativeWebView@@SA?AVQString@@PBD0@Z @ 3188 NONAME ; class QString QDeclarativeWebView::trUtf8(char const *, char const *)
-	?trUtf8@QDeclarativeWebView@@SA?AVQString@@PBD0H@Z @ 3189 NONAME ; class QString QDeclarativeWebView::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeWebPage@@SA?AVQString@@PBD0@Z @ 3186 NONAME ABSENT ; class QString QDeclarativeWebPage::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeWebPage@@SA?AVQString@@PBD0H@Z @ 3187 NONAME ABSENT ; class QString QDeclarativeWebPage::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeWebView@@SA?AVQString@@PBD0@Z @ 3188 NONAME ABSENT ; class QString QDeclarativeWebView::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeWebView@@SA?AVQString@@PBD0H@Z @ 3189 NONAME ABSENT ; class QString QDeclarativeWebView::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeXmlListModel@@SA?AVQString@@PBD0@Z @ 3190 NONAME ; class QString QDeclarativeXmlListModel::trUtf8(char const *, char const *)
 	?trUtf8@QDeclarativeXmlListModel@@SA?AVQString@@PBD0H@Z @ 3191 NONAME ; class QString QDeclarativeXmlListModel::trUtf8(char const *, char const *, int)
 	?trUtf8@QDeclarativeXmlListModelRole@@SA?AVQString@@PBD0@Z @ 3192 NONAME ; class QString QDeclarativeXmlListModelRole::trUtf8(char const *, char const *)
@@ -3198,11 +3198,11 @@ EXPORTS
 	?trUtf8@QPacketProtocol@@SA?AVQString@@PBD0H@Z @ 3197 NONAME ; class QString QPacketProtocol::trUtf8(char const *, char const *, int)
 	?trackedPositionChanged@QDeclarativeGridView@@AAEXXZ @ 3198 NONAME ; void QDeclarativeGridView::trackedPositionChanged(void)
 	?trackedPositionChanged@QDeclarativeListView@@AAEXXZ @ 3199 NONAME ; void QDeclarativeListView::trackedPositionChanged(void)
-	?transform@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQGraphicsTransform@@@@XZ @ 3200 NONAME ; struct QDeclarativeListProperty<class QGraphicsTransform> QDeclarativeItem::transform(void)
+	?transform@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQGraphicsTransform@@@@XZ @ 3200 NONAME ABSENT ; struct QDeclarativeListProperty<class QGraphicsTransform> QDeclarativeItem::transform(void)
 	?transformOrigin@QDeclarativeItem@@QBE?AW4TransformOrigin@1@XZ @ 3201 NONAME ; enum QDeclarativeItem::TransformOrigin QDeclarativeItem::transformOrigin(void) const
 	?transformOriginChanged@QDeclarativeItem@@IAEXW4TransformOrigin@1@@Z @ 3202 NONAME ; void QDeclarativeItem::transformOriginChanged(enum QDeclarativeItem::TransformOrigin)
-	?transitions@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 3203 NONAME ; struct QDeclarativeListProperty<class QDeclarativeTransition> QDeclarativeItem::transitions(void)
-	?transitionsProperty@QDeclarativeStateGroup@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 3204 NONAME ; struct QDeclarativeListProperty<class QDeclarativeTransition> QDeclarativeStateGroup::transitionsProperty(void)
+	?transitions@QDeclarativeItem@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 3203 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativeTransition> QDeclarativeItem::transitions(void)
+	?transitionsProperty@QDeclarativeStateGroup@@QAE?AU?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 3204 NONAME ABSENT ; struct QDeclarativeListProperty<class QDeclarativeTransition> QDeclarativeStateGroup::transitionsProperty(void)
 	?triggered@QDeclarativeTimer@@IAEXXZ @ 3205 NONAME ; void QDeclarativeTimer::triggered(void)
 	?triggeredOnStart@QDeclarativeTimer@@QBE_NXZ @ 3206 NONAME ; bool QDeclarativeTimer::triggeredOnStart(void) const
 	?type@QDeclarativeDomImport@@QBE?AW4Type@1@XZ @ 3207 NONAME ; enum QDeclarativeDomImport::Type QDeclarativeDomImport::type(void) const
@@ -3233,8 +3233,8 @@ EXPORTS
 	?url@QDeclarativeDomObject@@QBE?AVQUrl@@XZ @ 3232 NONAME ; class QUrl QDeclarativeDomObject::url(void) const
 	?url@QDeclarativeError@@QBE?AVQUrl@@XZ @ 3233 NONAME ; class QUrl QDeclarativeError::url(void) const
 	?url@QDeclarativePixmapReply@@QBEABVQUrl@@XZ @ 3234 NONAME ; class QUrl const & QDeclarativePixmapReply::url(void) const
-	?url@QDeclarativeWebView@@QBE?AVQUrl@@XZ @ 3235 NONAME ; class QUrl QDeclarativeWebView::url(void) const
-	?urlChanged@QDeclarativeWebView@@IAEXXZ @ 3236 NONAME ; void QDeclarativeWebView::urlChanged(void)
+	?url@QDeclarativeWebView@@QBE?AVQUrl@@XZ @ 3235 NONAME ABSENT ; class QUrl QDeclarativeWebView::url(void) const
+	?urlChanged@QDeclarativeWebView@@IAEXXZ @ 3236 NONAME ABSENT ; void QDeclarativeWebView::urlChanged(void)
 	?usedAnchors@QDeclarativeAnchors@@QBE?AV?$QFlags@W4UsedAnchor@QDeclarativeAnchors@@@@XZ @ 3237 NONAME ; class QFlags<enum QDeclarativeAnchors::UsedAnchor> QDeclarativeAnchors::usedAnchors(void) const
 	?vAlign@QDeclarativeText@@QBE?AW4VAlignment@1@XZ @ 3238 NONAME ; enum QDeclarativeText::VAlignment QDeclarativeText::vAlign(void) const
 	?vAlign@QDeclarativeTextEdit@@QBE?AW4VAlignment@1@XZ @ 3239 NONAME ; enum QDeclarativeTextEdit::VAlignment QDeclarativeTextEdit::vAlign(void) const
@@ -3255,28 +3255,28 @@ EXPORTS
 	?value@QMetaEnumBuilder@@QBEHH@Z @ 3254 NONAME ; int QMetaEnumBuilder::value(int) const
 	?valueChanged@QDeclarativeDebugWatch@@IAEXABVQByteArray@@ABVQVariant@@@Z @ 3255 NONAME ; void QDeclarativeDebugWatch::valueChanged(class QByteArray const &, class QVariant const &)
 	?valueChanged@QDeclarativeExpression@@IAEXXZ @ 3256 NONAME ; void QDeclarativeExpression::valueChanged(void)
-	?valueChanged@QDeclarativePropertyMap@@IAEXABVQString@@@Z @ 3257 NONAME ; void QDeclarativePropertyMap::valueChanged(class QString const &)
+	?valueChanged@QDeclarativePropertyMap@@IAEXABVQString@@@Z @ 3257 NONAME ABSENT ; void QDeclarativePropertyMap::valueChanged(class QString const &)
 	?valueChanged@QDeclarativeSpringFollow@@IAEXM@Z @ 3258 NONAME ; void QDeclarativeSpringFollow::valueChanged(float)
-	?valueForNode@QDeclarativeListModel@@ABE?AVQVariant@@PAUModelNode@@@Z @ 3259 NONAME ; class QVariant QDeclarativeListModel::valueForNode(struct ModelNode *) const
+	?valueForNode@QDeclarativeListModel@@ABE?AVQVariant@@PAUModelNode@@@Z @ 3259 NONAME ABSENT ; class QVariant QDeclarativeListModel::valueForNode(struct ModelNode *) const
 	?valueType@QDeclarativeValueTypeFactory@@SAPAVQDeclarativeValueType@@H@Z @ 3260 NONAME ; class QDeclarativeValueType * QDeclarativeValueTypeFactory::valueType(int)
 	?valueTypeName@QDeclarativeDebugPropertyReference@@QBE?AVQString@@XZ @ 3261 NONAME ; class QString QDeclarativeDebugPropertyReference::valueTypeName(void) const
 	?values@QDeclarativeDomList@@QBE?AV?$QList@VQDeclarativeDomValue@@@@XZ @ 3262 NONAME ; class QList<class QDeclarativeDomValue> QDeclarativeDomList::values(void) const
 	?variantFromString@QDeclarativeStringConverters@@YA?AVQVariant@@ABVQString@@@Z @ 3263 NONAME ; class QVariant QDeclarativeStringConverters::variantFromString(class QString const &)
 	?variantFromString@QDeclarativeStringConverters@@YA?AVQVariant@@ABVQString@@HPA_N@Z @ 3264 NONAME ; class QVariant QDeclarativeStringConverters::variantFromString(class QString const &, int, bool *)
 	?vector3DFromString@QDeclarativeStringConverters@@YA?AVQVector3D@@ABVQString@@PA_N@Z @ 3265 NONAME ; class QVector3D QDeclarativeStringConverters::vector3DFromString(class QString const &, bool *)
-	?velocity@QDeclarativeEaseFollow@@QBEMXZ @ 3266 NONAME ; float QDeclarativeEaseFollow::velocity(void) const
-	?velocity@QDeclarativeParticles@@QBEMXZ @ 3267 NONAME ; float QDeclarativeParticles::velocity(void) const
+	?velocity@QDeclarativeEaseFollow@@QBEMXZ @ 3266 NONAME ABSENT ; float QDeclarativeEaseFollow::velocity(void) const
+	?velocity@QDeclarativeParticles@@QBEMXZ @ 3267 NONAME ABSENT ; float QDeclarativeParticles::velocity(void) const
 	?velocity@QDeclarativeSpringFollow@@QBEMXZ @ 3268 NONAME ; float QDeclarativeSpringFollow::velocity(void) const
-	?velocityChanged@QDeclarativeEaseFollow@@IAEXXZ @ 3269 NONAME ; void QDeclarativeEaseFollow::velocityChanged(void)
-	?velocityChanged@QDeclarativeParticles@@IAEXXZ @ 3270 NONAME ; void QDeclarativeParticles::velocityChanged(void)
-	?velocityDeviation@QDeclarativeParticles@@QBEMXZ @ 3271 NONAME ; float QDeclarativeParticles::velocityDeviation(void) const
-	?velocityDeviationChanged@QDeclarativeParticles@@IAEXXZ @ 3272 NONAME ; void QDeclarativeParticles::velocityDeviationChanged(void)
+	?velocityChanged@QDeclarativeEaseFollow@@IAEXXZ @ 3269 NONAME ABSENT ; void QDeclarativeEaseFollow::velocityChanged(void)
+	?velocityChanged@QDeclarativeParticles@@IAEXXZ @ 3270 NONAME ABSENT ; void QDeclarativeParticles::velocityChanged(void)
+	?velocityDeviation@QDeclarativeParticles@@QBEMXZ @ 3271 NONAME ABSENT ; float QDeclarativeParticles::velocityDeviation(void) const
+	?velocityDeviationChanged@QDeclarativeParticles@@IAEXXZ @ 3272 NONAME ABSENT ; void QDeclarativeParticles::velocityDeviationChanged(void)
 	?version@QDeclarativeDomImport@@QBE?AVQString@@XZ @ 3273 NONAME ; class QString QDeclarativeDomImport::version(void) const
 	?verticalAlignmentChanged@QDeclarativeText@@IAEXW4VAlignment@1@@Z @ 3274 NONAME ; void QDeclarativeText::verticalAlignmentChanged(enum QDeclarativeText::VAlignment)
 	?verticalAlignmentChanged@QDeclarativeTextEdit@@IAEXW4VAlignment@1@@Z @ 3275 NONAME ; void QDeclarativeTextEdit::verticalAlignmentChanged(enum QDeclarativeTextEdit::VAlignment)
-	?verticalCenter@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3276 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::verticalCenter(void) const
-	?verticalCenter@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3277 NONAME ; class QDeclarativeAnchorLine QDeclarativeAnchors::verticalCenter(void) const
-	?verticalCenter@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3278 NONAME ; class QDeclarativeAnchorLine QDeclarativeItem::verticalCenter(void) const
+	?verticalCenter@QDeclarativeAnchorChanges@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3276 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchorChanges::verticalCenter(void) const
+	?verticalCenter@QDeclarativeAnchors@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3277 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeAnchors::verticalCenter(void) const
+	?verticalCenter@QDeclarativeItem@@QBE?AVQDeclarativeAnchorLine@@XZ @ 3278 NONAME ABSENT ; class QDeclarativeAnchorLine QDeclarativeItem::verticalCenter(void) const
 	?verticalCenterChanged@QDeclarativeAnchors@@IAEXXZ @ 3279 NONAME ; void QDeclarativeAnchors::verticalCenterChanged(void)
 	?verticalCenterOffset@QDeclarativeAnchors@@QBEMXZ @ 3280 NONAME ; float QDeclarativeAnchors::verticalCenterOffset(void) const
 	?verticalCenterOffsetChanged@QDeclarativeAnchors@@IAEXXZ @ 3281 NONAME ; void QDeclarativeAnchors::verticalCenterOffsetChanged(void)
@@ -3285,7 +3285,7 @@ EXPORTS
 	?verticalTileRule@QDeclarativeGridScaledImage@@QBE?AW4TileMode@QDeclarativeBorderImage@@XZ @ 3284 NONAME ; enum QDeclarativeBorderImage::TileMode QDeclarativeGridScaledImage::verticalTileRule(void) const
 	?verticalVelocity@QDeclarativeFlickable@@QBEMXZ @ 3285 NONAME ; float QDeclarativeFlickable::verticalVelocity(void) const
 	?verticalVelocityChanged@QDeclarativeFlickable@@IAEXXZ @ 3286 NONAME ; void QDeclarativeFlickable::verticalVelocityChanged(void)
-	?viewItem@QDeclarativeWebPage@@AAEPAVQDeclarativeWebView@@XZ @ 3287 NONAME ; class QDeclarativeWebView * QDeclarativeWebPage::viewItem(void)
+	?viewItem@QDeclarativeWebPage@@AAEPAVQDeclarativeWebView@@XZ @ 3287 NONAME ABSENT ; class QDeclarativeWebView * QDeclarativeWebPage::viewItem(void)
 	?viewport@QDeclarativeFlickable@@QAEPAVQDeclarativeItem@@XZ @ 3288 NONAME ; class QDeclarativeItem * QDeclarativeFlickable::viewport(void)
 	?viewportMoved@QDeclarativeFlickable@@MAEXXZ @ 3289 NONAME ; void QDeclarativeFlickable::viewportMoved(void)
 	?viewportMoved@QDeclarativeGridView@@MAEXXZ @ 3290 NONAME ; void QDeclarativeGridView::viewportMoved(void)
@@ -3293,19 +3293,19 @@ EXPORTS
 	?visibleArea@QDeclarativeFlickable@@IAEPAVQDeclarativeFlickableVisibleArea@@XZ @ 3292 NONAME ; class QDeclarativeFlickableVisibleArea * QDeclarativeFlickable::visibleArea(void)
 	?waitForClients@QDeclarativeDebugService@@SAXXZ @ 3293 NONAME ; void QDeclarativeDebugService::waitForClients(void)
 	?wantsFocus@QDeclarativeItem@@QBE_NXZ @ 3294 NONAME ; bool QDeclarativeItem::wantsFocus(void) const
-	?wantsFocusChanged@QDeclarativeItem@@IAEXXZ @ 3295 NONAME ; void QDeclarativeItem::wantsFocusChanged(void)
+	?wantsFocusChanged@QDeclarativeItem@@IAEXXZ @ 3295 NONAME ABSENT ; void QDeclarativeItem::wantsFocusChanged(void)
 	?wheelEvent@QDeclarativeFlickable@@MAEXPAVQGraphicsSceneWheelEvent@@@Z @ 3296 NONAME ; void QDeclarativeFlickable::wheelEvent(class QGraphicsSceneWheelEvent *)
 	?when@QDeclarativeBind@@QBE_NXZ @ 3297 NONAME ; bool QDeclarativeBind::when(void) const
 	?when@QDeclarativeState@@QBEPAVQDeclarativeBinding@@XZ @ 3298 NONAME ; class QDeclarativeBinding * QDeclarativeState::when(void) const
 	?width@QDeclarativeItem@@QBEMXZ @ 3299 NONAME ; float QDeclarativeItem::width(void) const
 	?width@QDeclarativeParentChange@@QBEMXZ @ 3300 NONAME ; float QDeclarativeParentChange::width(void) const
 	?width@QDeclarativePen@@QBEHXZ @ 3301 NONAME ; int QDeclarativePen::width(void) const
-	?widthChange@QDeclarativeFlickable@@IAEXXZ @ 3302 NONAME ; void QDeclarativeFlickable::widthChange(void)
-	?widthChanged@QDeclarativeItem@@IAEXXZ @ 3303 NONAME ; void QDeclarativeItem::widthChanged(void)
+	?widthChange@QDeclarativeFlickable@@IAEXXZ @ 3302 NONAME ABSENT ; void QDeclarativeFlickable::widthChange(void)
+	?widthChanged@QDeclarativeItem@@IAEXXZ @ 3303 NONAME ABSENT ; void QDeclarativeItem::widthChanged(void)
 	?widthIsSet@QDeclarativeParentChange@@QBE_NXZ @ 3304 NONAME ; bool QDeclarativeParentChange::widthIsSet(void) const
 	?widthValid@QDeclarativeItem@@IBE_NXZ @ 3305 NONAME ; bool QDeclarativeItem::widthValid(void) const
 	?window@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 3306 NONAME ; class QColor QDeclarativeSystemPalette::window(void) const
-	?windowObjectCleared@QDeclarativeWebView@@AAEXXZ @ 3307 NONAME ; void QDeclarativeWebView::windowObjectCleared(void)
+	?windowObjectCleared@QDeclarativeWebView@@AAEXXZ @ 3307 NONAME ABSENT ; void QDeclarativeWebView::windowObjectCleared(void)
 	?windowText@QDeclarativeSystemPalette@@QBE?AVQColor@@XZ @ 3308 NONAME ; class QColor QDeclarativeSystemPalette::windowText(void) const
 	?wrap@QDeclarativeText@@QBE_NXZ @ 3309 NONAME ; bool QDeclarativeText::wrap(void) const
 	?wrap@QDeclarativeTextEdit@@QBE_NXZ @ 3310 NONAME ; bool QDeclarativeTextEdit::wrap(void) const
@@ -3318,29 +3318,29 @@ EXPORTS
 	?write@QDeclarativeProperty@@SA_NPAVQObject@@ABVQString@@ABVQVariant@@PAVQDeclarativeEngine@@@Z @ 3317 NONAME ; bool QDeclarativeProperty::write(class QObject *, class QString const &, class QVariant const &, class QDeclarativeEngine *)
 	?x@QDeclarativeCurve@@QBEMXZ @ 3318 NONAME ; float QDeclarativeCurve::x(void) const
 	?x@QDeclarativeParentChange@@QBEMXZ @ 3319 NONAME ; float QDeclarativeParentChange::x(void) const
-	?xAttractor@QDeclarativeParticleMotionGravity@@QBEMXZ @ 3320 NONAME ; float QDeclarativeParticleMotionGravity::xAttractor(void) const
+	?xAttractor@QDeclarativeParticleMotionGravity@@QBEMXZ @ 3320 NONAME ABSENT ; float QDeclarativeParticleMotionGravity::xAttractor(void) const
 	?xIsSet@QDeclarativeParentChange@@QBE_NXZ @ 3321 NONAME ; bool QDeclarativeParentChange::xIsSet(void) const
 	?xToPos@QDeclarativeTextInput@@QAEHH@Z @ 3322 NONAME ; int QDeclarativeTextInput::xToPos(int)
-	?xVariance@QDeclarativeParticleMotionWander@@QBEMXZ @ 3323 NONAME ; float QDeclarativeParticleMotionWander::xVariance(void) const
-	?xattractorChanged@QDeclarativeParticleMotionGravity@@IAEXXZ @ 3324 NONAME ; void QDeclarativeParticleMotionGravity::xattractorChanged(void)
+	?xVariance@QDeclarativeParticleMotionWander@@QBEMXZ @ 3323 NONAME ABSENT ; float QDeclarativeParticleMotionWander::xVariance(void) const
+	?xattractorChanged@QDeclarativeParticleMotionGravity@@IAEXXZ @ 3324 NONAME ABSENT ; void QDeclarativeParticleMotionGravity::xattractorChanged(void)
 	?xflick@QDeclarativeFlickable@@IBE_NXZ @ 3325 NONAME ; bool QDeclarativeFlickable::xflick(void) const
 	?xmax@QDeclarativeDrag@@QBEMXZ @ 3326 NONAME ; float QDeclarativeDrag::xmax(void) const
 	?xmin@QDeclarativeDrag@@QBEMXZ @ 3327 NONAME ; float QDeclarativeDrag::xmin(void) const
 	?xml@QDeclarativeXmlListModel@@QBE?AVQString@@XZ @ 3328 NONAME ; class QString QDeclarativeXmlListModel::xml(void) const
-	?xvarianceChanged@QDeclarativeParticleMotionWander@@IAEXXZ @ 3329 NONAME ; void QDeclarativeParticleMotionWander::xvarianceChanged(void)
+	?xvarianceChanged@QDeclarativeParticleMotionWander@@IAEXXZ @ 3329 NONAME ABSENT ; void QDeclarativeParticleMotionWander::xvarianceChanged(void)
 	?y@QDeclarativeCurve@@QBEMXZ @ 3330 NONAME ; float QDeclarativeCurve::y(void) const
 	?y@QDeclarativeParentChange@@QBEMXZ @ 3331 NONAME ; float QDeclarativeParentChange::y(void) const
-	?yAttractor@QDeclarativeParticleMotionGravity@@QBEMXZ @ 3332 NONAME ; float QDeclarativeParticleMotionGravity::yAttractor(void) const
+	?yAttractor@QDeclarativeParticleMotionGravity@@QBEMXZ @ 3332 NONAME ABSENT ; float QDeclarativeParticleMotionGravity::yAttractor(void) const
 	?yIsSet@QDeclarativeParentChange@@QBE_NXZ @ 3333 NONAME ; bool QDeclarativeParentChange::yIsSet(void) const
-	?yVariance@QDeclarativeParticleMotionWander@@QBEMXZ @ 3334 NONAME ; float QDeclarativeParticleMotionWander::yVariance(void) const
-	?yattractorChanged@QDeclarativeParticleMotionGravity@@IAEXXZ @ 3335 NONAME ; void QDeclarativeParticleMotionGravity::yattractorChanged(void)
+	?yVariance@QDeclarativeParticleMotionWander@@QBEMXZ @ 3334 NONAME ABSENT ; float QDeclarativeParticleMotionWander::yVariance(void) const
+	?yattractorChanged@QDeclarativeParticleMotionGravity@@IAEXXZ @ 3335 NONAME ABSENT ; void QDeclarativeParticleMotionGravity::yattractorChanged(void)
 	?yflick@QDeclarativeFlickable@@IBE_NXZ @ 3336 NONAME ; bool QDeclarativeFlickable::yflick(void) const
 	?ymax@QDeclarativeDrag@@QBEMXZ @ 3337 NONAME ; float QDeclarativeDrag::ymax(void) const
 	?ymin@QDeclarativeDrag@@QBEMXZ @ 3338 NONAME ; float QDeclarativeDrag::ymin(void) const
-	?yvarianceChanged@QDeclarativeParticleMotionWander@@IAEXXZ @ 3339 NONAME ; void QDeclarativeParticleMotionWander::yvarianceChanged(void)
-	?zoomFactor@QDeclarativeWebView@@QBEMXZ @ 3340 NONAME ; float QDeclarativeWebView::zoomFactor(void) const
-	?zoomFactorChanged@QDeclarativeWebView@@IAEXXZ @ 3341 NONAME ; void QDeclarativeWebView::zoomFactorChanged(void)
-	?zoomTo@QDeclarativeWebView@@IAEXMHH@Z @ 3342 NONAME ; void QDeclarativeWebView::zoomTo(float, int, int)
+	?yvarianceChanged@QDeclarativeParticleMotionWander@@IAEXXZ @ 3339 NONAME ABSENT ; void QDeclarativeParticleMotionWander::yvarianceChanged(void)
+	?zoomFactor@QDeclarativeWebView@@QBEMXZ @ 3340 NONAME ABSENT ; float QDeclarativeWebView::zoomFactor(void) const
+	?zoomFactorChanged@QDeclarativeWebView@@IAEXXZ @ 3341 NONAME ABSENT ; void QDeclarativeWebView::zoomFactorChanged(void)
+	?zoomTo@QDeclarativeWebView@@IAEXMHH@Z @ 3342 NONAME ABSENT ; void QDeclarativeWebView::zoomTo(float, int, int)
 	?staticMetaObject@QDeclarativePathElement@@2UQMetaObject@@B @ 3343 NONAME ; struct QMetaObject const QDeclarativePathElement::staticMetaObject
 	?staticMetaObject@QDeclarativeDebugObjectQuery@@2UQMetaObject@@B @ 3344 NONAME ; struct QMetaObject const QDeclarativeDebugObjectQuery::staticMetaObject
 	?staticMetaObject@QDeclarativeTextInput@@2UQMetaObject@@B @ 3345 NONAME ; struct QMetaObject const QDeclarativeTextInput::staticMetaObject
@@ -3364,17 +3364,17 @@ EXPORTS
 	?staticMetaObject@QDeclarativeParentChange@@2UQMetaObject@@B @ 3363 NONAME ; struct QMetaObject const QDeclarativeParentChange::staticMetaObject
 	?staticMetaObject@QDeclarativeCurve@@2UQMetaObject@@B @ 3364 NONAME ; struct QMetaObject const QDeclarativeCurve::staticMetaObject
 	?staticMetaObject@QDeclarativeImage@@2UQMetaObject@@B @ 3365 NONAME ; struct QMetaObject const QDeclarativeImage::staticMetaObject
-	?staticMetaObject@QDeclarativeEaseFollow@@2UQMetaObject@@B @ 3366 NONAME ; struct QMetaObject const QDeclarativeEaseFollow::staticMetaObject
+	?staticMetaObject@QDeclarativeEaseFollow@@2UQMetaObject@@B @ 3366 NONAME ABSENT ; struct QMetaObject const QDeclarativeEaseFollow::staticMetaObject
 	?staticMetaObject@QDeclarativePixmapReply@@2UQMetaObject@@B @ 3367 NONAME ; struct QMetaObject const QDeclarativePixmapReply::staticMetaObject
-	?staticMetaObject@QDeclarativeDateTimeFormatter@@2UQMetaObject@@B @ 3368 NONAME ; struct QMetaObject const QDeclarativeDateTimeFormatter::staticMetaObject
+	?staticMetaObject@QDeclarativeDateTimeFormatter@@2UQMetaObject@@B @ 3368 NONAME ABSENT ; struct QMetaObject const QDeclarativeDateTimeFormatter::staticMetaObject
 	?staticMetaObject@QDeclarativePathQuad@@2UQMetaObject@@B @ 3369 NONAME ; struct QMetaObject const QDeclarativePathQuad::staticMetaObject
 	?staticMetaObject@QDeclarativeContext@@2UQMetaObject@@B @ 3370 NONAME ; struct QMetaObject const QDeclarativeContext::staticMetaObject
-	?staticMetaObject@QDeclarativeWebPage@@2UQMetaObject@@B @ 3371 NONAME ; struct QMetaObject const QDeclarativeWebPage::staticMetaObject
+	?staticMetaObject@QDeclarativeWebPage@@2UQMetaObject@@B @ 3371 NONAME ABSENT ; struct QMetaObject const QDeclarativeWebPage::staticMetaObject
 	?staticMetaObject@QDeclarativeAnchorChanges@@2UQMetaObject@@B @ 3372 NONAME ; struct QMetaObject const QDeclarativeAnchorChanges::staticMetaObject
 	?staticMetaObject@QDeclarativeDebugService@@2UQMetaObject@@B @ 3373 NONAME ; struct QMetaObject const QDeclarativeDebugService::staticMetaObject
 	?staticMetaObject@QDeclarativeEngine@@2UQMetaObject@@B @ 3374 NONAME ; struct QMetaObject const QDeclarativeEngine::staticMetaObject
 	?staticMetaObject@QDeclarativeFlickable@@2UQMetaObject@@B @ 3375 NONAME ; struct QMetaObject const QDeclarativeFlickable::staticMetaObject
-	?staticMetaObject@QDeclarativeParticleMotionGravity@@2UQMetaObject@@B @ 3376 NONAME ; struct QMetaObject const QDeclarativeParticleMotionGravity::staticMetaObject
+	?staticMetaObject@QDeclarativeParticleMotionGravity@@2UQMetaObject@@B @ 3376 NONAME ABSENT ; struct QMetaObject const QDeclarativeParticleMotionGravity::staticMetaObject
 	?staticMetaObject@QDeclarativePathCubic@@2UQMetaObject@@B @ 3377 NONAME ; struct QMetaObject const QDeclarativePathCubic::staticMetaObject
 	?staticMetaObject@QDeclarativeBehavior@@2UQMetaObject@@B @ 3378 NONAME ; struct QMetaObject const QDeclarativeBehavior::staticMetaObject
 	?staticMetaObject@QDeclarativeRepeater@@2UQMetaObject@@B @ 3379 NONAME ; struct QMetaObject const QDeclarativeRepeater::staticMetaObject
@@ -3383,7 +3383,7 @@ EXPORTS
 	?staticMetaObject@QDeclarativeExtensionPlugin@@2UQMetaObject@@B @ 3382 NONAME ; struct QMetaObject const QDeclarativeExtensionPlugin::staticMetaObject
 	?staticMetaObject@QDeclarativeValueType@@2UQMetaObject@@B @ 3383 NONAME ; struct QMetaObject const QDeclarativeValueType::staticMetaObject
 	?staticMetaObject@QDeclarativeRectangle@@2UQMetaObject@@B @ 3384 NONAME ; struct QMetaObject const QDeclarativeRectangle::staticMetaObject
-	?staticMetaObject@QDeclarativeWebView@@2UQMetaObject@@B @ 3385 NONAME ; struct QMetaObject const QDeclarativeWebView::staticMetaObject
+	?staticMetaObject@QDeclarativeWebView@@2UQMetaObject@@B @ 3385 NONAME ABSENT ; struct QMetaObject const QDeclarativeWebView::staticMetaObject
 	?staticMetaObject@QDeclarativeRow@@2UQMetaObject@@B @ 3386 NONAME ; struct QMetaObject const QDeclarativeRow::staticMetaObject
 	?staticMetaObject@QDeclarativeGrid@@2UQMetaObject@@B @ 3387 NONAME ; struct QMetaObject const QDeclarativeGrid::staticMetaObject
 	?staticMetaObject@QDeclarativeEngineDebug@@2UQMetaObject@@B @ 3388 NONAME ; struct QMetaObject const QDeclarativeEngineDebug::staticMetaObject
@@ -3404,8 +3404,8 @@ EXPORTS
 	?staticMetaObject@QDeclarativeBind@@2UQMetaObject@@B @ 3403 NONAME ; struct QMetaObject const QDeclarativeBind::staticMetaObject
 	?staticMetaObject@QDeclarativeAnimatedImage@@2UQMetaObject@@B @ 3404 NONAME ; struct QMetaObject const QDeclarativeAnimatedImage::staticMetaObject
 	?staticMetaObject@QDeclarativeDebugRootContextQuery@@2UQMetaObject@@B @ 3405 NONAME ; struct QMetaObject const QDeclarativeDebugRootContextQuery::staticMetaObject
-	?attachedProperties@QDeclarativePathView@@0V?$QHash@PAVQObject@@PAV1@@@A @ 3406 NONAME ; class QHash<class QObject *, class QObject *> QDeclarativePathView::attachedProperties
-	?staticMetaObject@QDeclarativeParticles@@2UQMetaObject@@B @ 3407 NONAME ; struct QMetaObject const QDeclarativeParticles::staticMetaObject
+	?attachedProperties@QDeclarativePathView@@0V?$QHash@PAVQObject@@PAV1@@@A @ 3406 NONAME ABSENT ; class QHash<class QObject *, class QObject *> QDeclarativePathView::attachedProperties
+	?staticMetaObject@QDeclarativeParticles@@2UQMetaObject@@B @ 3407 NONAME ABSENT ; struct QMetaObject const QDeclarativeParticles::staticMetaObject
 	?staticMetaObject@QDeclarativePath@@2UQMetaObject@@B @ 3408 NONAME ; struct QMetaObject const QDeclarativePath::staticMetaObject
 	?staticMetaObject@QDeclarativeTextEdit@@2UQMetaObject@@B @ 3409 NONAME ; struct QMetaObject const QDeclarativeTextEdit::staticMetaObject
 	?staticMetaObject@QDeclarativePathPercent@@2UQMetaObject@@B @ 3410 NONAME ; struct QMetaObject const QDeclarativePathPercent::staticMetaObject
@@ -3414,7 +3414,7 @@ EXPORTS
 	?staticMetaObject@QDeclarativeFlipable@@2UQMetaObject@@B @ 3413 NONAME ; struct QMetaObject const QDeclarativeFlipable::staticMetaObject
 	?staticMetaObject@QDeclarativeBasePositioner@@2UQMetaObject@@B @ 3414 NONAME ; struct QMetaObject const QDeclarativeBasePositioner::staticMetaObject
 	?staticMetaObject@QDeclarativeState@@2UQMetaObject@@B @ 3415 NONAME ; struct QMetaObject const QDeclarativeState::staticMetaObject
-	?staticMetaObject@QDeclarativeParticleMotionWander@@2UQMetaObject@@B @ 3416 NONAME ; struct QMetaObject const QDeclarativeParticleMotionWander::staticMetaObject
+	?staticMetaObject@QDeclarativeParticleMotionWander@@2UQMetaObject@@B @ 3416 NONAME ABSENT ; struct QMetaObject const QDeclarativeParticleMotionWander::staticMetaObject
 	?staticMetaObject@QDeclarativePathView@@2UQMetaObject@@B @ 3417 NONAME ; struct QMetaObject const QDeclarativePathView::staticMetaObject
 	?staticMetaObject@QDeclarativeExpression@@2UQMetaObject@@B @ 3418 NONAME ; struct QMetaObject const QDeclarativeExpression::staticMetaObject
 	?staticMetaObject@QDeclarativeView@@2UQMetaObject@@B @ 3419 NONAME ; struct QMetaObject const QDeclarativeView::staticMetaObject
@@ -3422,11 +3422,11 @@ EXPORTS
 	?staticMetaObject@QDeclarativeDebugEnginesQuery@@2UQMetaObject@@B @ 3421 NONAME ; struct QMetaObject const QDeclarativeDebugEnginesQuery::staticMetaObject
 	?staticMetaObject@QDeclarativeStateOperation@@2UQMetaObject@@B @ 3422 NONAME ; struct QMetaObject const QDeclarativeStateOperation::staticMetaObject
 	?staticMetaObject@QDeclarativeVisualDataModel@@2UQMetaObject@@B @ 3423 NONAME ; struct QMetaObject const QDeclarativeVisualDataModel::staticMetaObject
-	?staticMetaObject@QDeclarativeNumberFormatter@@2UQMetaObject@@B @ 3424 NONAME ; struct QMetaObject const QDeclarativeNumberFormatter::staticMetaObject
-	?staticMetaObject@QDeclarativeParticleMotionLinear@@2UQMetaObject@@B @ 3425 NONAME ; struct QMetaObject const QDeclarativeParticleMotionLinear::staticMetaObject
+	?staticMetaObject@QDeclarativeNumberFormatter@@2UQMetaObject@@B @ 3424 NONAME ABSENT ; struct QMetaObject const QDeclarativeNumberFormatter::staticMetaObject
+	?staticMetaObject@QDeclarativeParticleMotionLinear@@2UQMetaObject@@B @ 3425 NONAME ABSENT ; struct QMetaObject const QDeclarativeParticleMotionLinear::staticMetaObject
 	?staticMetaObject@QDeclarativeFontLoader@@2UQMetaObject@@B @ 3426 NONAME ; struct QMetaObject const QDeclarativeFontLoader::staticMetaObject
 	?staticMetaObject@QDeclarativeSystemPalette@@2UQMetaObject@@B @ 3427 NONAME ; struct QMetaObject const QDeclarativeSystemPalette::staticMetaObject
-	?staticMetaObject@QDeclarativeParticleMotion@@2UQMetaObject@@B @ 3428 NONAME ; struct QMetaObject const QDeclarativeParticleMotion::staticMetaObject
+	?staticMetaObject@QDeclarativeParticleMotion@@2UQMetaObject@@B @ 3428 NONAME ABSENT ; struct QMetaObject const QDeclarativeParticleMotion::staticMetaObject
 	?staticMetaObject@QDeclarativeViewSection@@2UQMetaObject@@B @ 3429 NONAME ; struct QMetaObject const QDeclarativeViewSection::staticMetaObject
 	?staticMetaObject@QDeclarativeXmlListModelRole@@2UQMetaObject@@B @ 3430 NONAME ; struct QMetaObject const QDeclarativeXmlListModelRole::staticMetaObject
 	?staticMetaObject@QDeclarativeXmlListModel@@2UQMetaObject@@B @ 3431 NONAME ; struct QMetaObject const QDeclarativeXmlListModel::staticMetaObject
@@ -3439,11 +3439,11 @@ EXPORTS
 	?staticMetaObject@QDeclarativeComponent@@2UQMetaObject@@B @ 3438 NONAME ; struct QMetaObject const QDeclarativeComponent::staticMetaObject
 	??0QDeclarativeAbstractBinding@@QAE@XZ @ 3439 NONAME ; QDeclarativeAbstractBinding::QDeclarativeAbstractBinding(void)
 	??0QDeclarativeBinding@@QAE@ABVQString@@PAVQObject@@PAVQDeclarativeContext@@1@Z @ 3440 NONAME ; QDeclarativeBinding::QDeclarativeBinding(class QString const &, class QObject *, class QDeclarativeContext *, class QObject *)
-	??0QDeclarativeBinding@@QAE@PAXPAVQDeclarativeRefCount@@PAVQObject@@PAVQDeclarativeContext@@ABVQString@@H2@Z @ 3441 NONAME ; QDeclarativeBinding::QDeclarativeBinding(void *, class QDeclarativeRefCount *, class QObject *, class QDeclarativeContext *, class QString const &, int, class QObject *)
+	??0QDeclarativeBinding@@QAE@PAXPAVQDeclarativeRefCount@@PAVQObject@@PAVQDeclarativeContext@@ABVQString@@H2@Z @ 3441 NONAME ABSENT ; QDeclarativeBinding::QDeclarativeBinding(void *, class QDeclarativeRefCount *, class QObject *, class QDeclarativeContext *, class QString const &, int, class QObject *)
 	??0QDeclarativePropertyPrivate@@QAE@ABV0@@Z @ 3442 NONAME ; QDeclarativePropertyPrivate::QDeclarativePropertyPrivate(class QDeclarativePropertyPrivate const &)
 	??0QDeclarativePropertyPrivate@@QAE@XZ @ 3443 NONAME ; QDeclarativePropertyPrivate::QDeclarativePropertyPrivate(void)
-	??1QDeclarativeAbstractBinding@@UAE@XZ @ 3444 NONAME ; QDeclarativeAbstractBinding::~QDeclarativeAbstractBinding(void)
-	??1QDeclarativeBinding@@UAE@XZ @ 3445 NONAME ; QDeclarativeBinding::~QDeclarativeBinding(void)
+	??1QDeclarativeAbstractBinding@@UAE@XZ @ 3444 NONAME ABSENT ; QDeclarativeAbstractBinding::~QDeclarativeAbstractBinding(void)
+	??1QDeclarativeBinding@@UAE@XZ @ 3445 NONAME ABSENT ; QDeclarativeBinding::~QDeclarativeBinding(void)
 	??1QDeclarativePropertyPrivate@@QAE@XZ @ 3446 NONAME ; QDeclarativePropertyPrivate::~QDeclarativePropertyPrivate(void)
 	??_EQDeclarativeAbstractBinding@@UAE@I@Z @ 3447 NONAME ; QDeclarativeAbstractBinding::~QDeclarativeAbstractBinding(unsigned int)
 	??_EQDeclarativeBinding@@UAE@I@Z @ 3448 NONAME ; QDeclarativeBinding::~QDeclarativeBinding(unsigned int)
@@ -3472,11 +3472,11 @@ EXPORTS
 	?rawMetaObjectForType@QDeclarativePropertyPrivate@@SAPBUQMetaObject@@PAVQDeclarativeEnginePrivate@@H@Z @ 3471 NONAME ; struct QMetaObject const * QDeclarativePropertyPrivate::rawMetaObjectForType(class QDeclarativeEnginePrivate *, int)
 	?readValueProperty@QDeclarativePropertyPrivate@@QAE?AVQVariant@@XZ @ 3472 NONAME ; class QVariant QDeclarativePropertyPrivate::readValueProperty(void)
 	?removeFromObject@QDeclarativeAbstractBinding@@QAEXXZ @ 3473 NONAME ; void QDeclarativeAbstractBinding::removeFromObject(void)
-	?restore@QDeclarativePropertyPrivate@@SA?AVQDeclarativeProperty@@ABVQByteArray@@PAVQObject@@PAVQDeclarativeContext@@@Z @ 3474 NONAME ; class QDeclarativeProperty QDeclarativePropertyPrivate::restore(class QByteArray const &, class QObject *, class QDeclarativeContext *)
+	?restore@QDeclarativePropertyPrivate@@SA?AVQDeclarativeProperty@@ABVQByteArray@@PAVQObject@@PAVQDeclarativeContext@@@Z @ 3474 NONAME ABSENT ; class QDeclarativeProperty QDeclarativePropertyPrivate::restore(class QByteArray const &, class QObject *, class QDeclarativeContext *)
 	?saveProperty@QDeclarativePropertyPrivate@@SA?AVQByteArray@@PBUQMetaObject@@H@Z @ 3475 NONAME ; class QByteArray QDeclarativePropertyPrivate::saveProperty(struct QMetaObject const *, int)
 	?saveValueType@QDeclarativePropertyPrivate@@SA?AVQByteArray@@PBUQMetaObject@@H0H@Z @ 3476 NONAME ; class QByteArray QDeclarativePropertyPrivate::saveValueType(struct QMetaObject const *, int, struct QMetaObject const *, int)
 	?setBinding@QDeclarativePropertyPrivate@@SAPAVQDeclarativeAbstractBinding@@ABVQDeclarativeProperty@@PAV2@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3477 NONAME ; class QDeclarativeAbstractBinding * QDeclarativePropertyPrivate::setBinding(class QDeclarativeProperty const &, class QDeclarativeAbstractBinding *, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
-	?setBinding@QDeclarativePropertyPrivate@@SAPAVQDeclarativeAbstractBinding@@PAVQObject@@ABUData@QDeclarativePropertyCache@@PAV2@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3478 NONAME ; class QDeclarativeAbstractBinding * QDeclarativePropertyPrivate::setBinding(class QObject *, struct QDeclarativePropertyCache::Data const &, class QDeclarativeAbstractBinding *, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
+	?setBinding@QDeclarativePropertyPrivate@@SAPAVQDeclarativeAbstractBinding@@PAVQObject@@ABUData@QDeclarativePropertyCache@@PAV2@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3478 NONAME ABSENT ; class QDeclarativeAbstractBinding * QDeclarativePropertyPrivate::setBinding(class QObject *, struct QDeclarativePropertyCache::Data const &, class QDeclarativeAbstractBinding *, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
 	?setEnabled@QDeclarativeAbstractBinding@@QAEX_N@Z @ 3479 NONAME ; void QDeclarativeAbstractBinding::setEnabled(bool)
 	?setEnabled@QDeclarativeAbstractBinding@@UAEX_NV?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3480 NONAME ; void QDeclarativeAbstractBinding::setEnabled(bool, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
 	?setEnabled@QDeclarativeBinding@@UAEX_NV?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3481 NONAME ; void QDeclarativeBinding::setEnabled(bool, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
@@ -3492,8 +3492,330 @@ EXPORTS
 	?update@QDeclarativeBinding@@UAEXV?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3491 NONAME ; void QDeclarativeBinding::update(class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
 	?valueTypeCoreIndex@QDeclarativePropertyPrivate@@SAHABVQDeclarativeProperty@@@Z @ 3492 NONAME ; int QDeclarativePropertyPrivate::valueTypeCoreIndex(class QDeclarativeProperty const &)
 	?write@QDeclarativePropertyPrivate@@SA_NABVQDeclarativeProperty@@ABVQVariant@@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3493 NONAME ; bool QDeclarativePropertyPrivate::write(class QDeclarativeProperty const &, class QVariant const &, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
-	?write@QDeclarativePropertyPrivate@@SA_NPAVQObject@@ABUData@QDeclarativePropertyCache@@ABVQVariant@@PAVQDeclarativeContext@@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3494 NONAME ; bool QDeclarativePropertyPrivate::write(class QObject *, struct QDeclarativePropertyCache::Data const &, class QVariant const &, class QDeclarativeContext *, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
+	?write@QDeclarativePropertyPrivate@@SA_NPAVQObject@@ABUData@QDeclarativePropertyCache@@ABVQVariant@@PAVQDeclarativeContext@@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3494 NONAME ABSENT ; bool QDeclarativePropertyPrivate::write(class QObject *, struct QDeclarativePropertyCache::Data const &, class QVariant const &, class QDeclarativeContext *, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
 	?writeEnumProperty@QDeclarativePropertyPrivate@@SA_NABVQMetaProperty@@HPAVQObject@@ABVQVariant@@H@Z @ 3495 NONAME ; bool QDeclarativePropertyPrivate::writeEnumProperty(class QMetaProperty const &, int, class QObject *, class QVariant const &, int)
 	?writeValueProperty@QDeclarativePropertyPrivate@@QAE_NABVQVariant@@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3496 NONAME ; bool QDeclarativePropertyPrivate::writeValueProperty(class QVariant const &, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
 	?staticMetaObject@QDeclarativeBinding@@2UQMetaObject@@B @ 3497 NONAME ; struct QMetaObject const QDeclarativeBinding::staticMetaObject
+	??0QDeclarativeBinding@@QAE@ABVQString@@PAVQObject@@PAVQDeclarativeContextData@@1@Z @ 3498 NONAME ; QDeclarativeBinding::QDeclarativeBinding(class QString const &, class QObject *, class QDeclarativeContextData *, class QObject *)
+	??0QDeclarativeBinding@@QAE@PAXPAVQDeclarativeRefCount@@PAVQObject@@PAVQDeclarativeContextData@@ABVQString@@H2@Z @ 3499 NONAME ; QDeclarativeBinding::QDeclarativeBinding(void *, class QDeclarativeRefCount *, class QObject *, class QDeclarativeContextData *, class QString const &, int, class QObject *)
+	??0QDeclarativeContext@@AAE@PAVQDeclarativeContextData@@@Z @ 3500 NONAME ; QDeclarativeContext::QDeclarativeContext(class QDeclarativeContextData *)
+	??0QDeclarativeCustomParser@@QAE@XZ @ 3501 NONAME ; QDeclarativeCustomParser::QDeclarativeCustomParser(void)
+	??0QDeclarativeExpression@@AAE@PAVQDeclarativeContextData@@ABVQString@@PAVQObject@@@Z @ 3502 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, class QString const &, class QObject *)
+	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContextData@@ABVQString@@PAVQObject@@AAVQDeclarativeExpressionPrivate@@@Z @ 3503 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, class QString const &, class QObject *, class QDeclarativeExpressionPrivate &)
+	??0QDeclarativeExpression@@IAE@PAVQDeclarativeContextData@@PAXPAVQDeclarativeRefCount@@PAVQObject@@ABVQString@@HAAVQDeclarativeExpressionPrivate@@@Z @ 3504 NONAME ; QDeclarativeExpression::QDeclarativeExpression(class QDeclarativeContextData *, void *, class QDeclarativeRefCount *, class QObject *, class QString const &, int, class QDeclarativeExpressionPrivate &)
+	??0QDeclarativeItemPrivate@@QAE@XZ @ 3505 NONAME ; QDeclarativeItemPrivate::QDeclarativeItemPrivate(void)
+	??0QDeclarativeListModel@@AAE@_NPAVQObject@@@Z @ 3506 NONAME ; QDeclarativeListModel::QDeclarativeListModel(bool, class QObject *)
+	??0QDeclarativePixmapReply@@AAE@PAVQDeclarativeImageReader@@ABVQUrl@@HH@Z @ 3507 NONAME ; QDeclarativePixmapReply::QDeclarativePixmapReply(class QDeclarativeImageReader *, class QUrl const &, int, int)
+	??0QDeclarativeSmoothedAnimation@@QAE@PAVQObject@@@Z @ 3508 NONAME ; QDeclarativeSmoothedAnimation::QDeclarativeSmoothedAnimation(class QObject *)
+	??0QDeclarativeTranslate@@QAE@PAVQObject@@@Z @ 3509 NONAME ; QDeclarativeTranslate::QDeclarativeTranslate(class QObject *)
+	??0QDeclarativeWorkerScript@@QAE@PAVQObject@@@Z @ 3510 NONAME ; QDeclarativeWorkerScript::QDeclarativeWorkerScript(class QObject *)
+	??0Variant@QDeclarativeParser@@QAE@ABV01@@Z @ 3511 NONAME ; QDeclarativeParser::Variant::Variant(class QDeclarativeParser::Variant const &)
+	??0Variant@QDeclarativeParser@@QAE@ABVQString@@@Z @ 3512 NONAME ; QDeclarativeParser::Variant::Variant(class QString const &)
+	??0Variant@QDeclarativeParser@@QAE@ABVQString@@PAVNode@AST@QDeclarativeJS@@@Z @ 3513 NONAME ; QDeclarativeParser::Variant::Variant(class QString const &, class QDeclarativeJS::AST::Node *)
+	??0Variant@QDeclarativeParser@@QAE@NABVQString@@@Z @ 3514 NONAME ; QDeclarativeParser::Variant::Variant(double, class QString const &)
+	??0Variant@QDeclarativeParser@@QAE@XZ @ 3515 NONAME ; QDeclarativeParser::Variant::Variant(void)
+	??0Variant@QDeclarativeParser@@QAE@_N@Z @ 3516 NONAME ; QDeclarativeParser::Variant::Variant(bool)
+	??1QDeclarativeAbstractBinding@@MAE@XZ @ 3517 NONAME ; QDeclarativeAbstractBinding::~QDeclarativeAbstractBinding(void)
+	??1QDeclarativeBinding@@MAE@XZ @ 3518 NONAME ; QDeclarativeBinding::~QDeclarativeBinding(void)
+	??1QDeclarativeItemPrivate@@UAE@XZ @ 3519 NONAME ; QDeclarativeItemPrivate::~QDeclarativeItemPrivate(void)
+	??1QDeclarativeSmoothedAnimation@@UAE@XZ @ 3520 NONAME ; QDeclarativeSmoothedAnimation::~QDeclarativeSmoothedAnimation(void)
+	??1QDeclarativeTranslate@@UAE@XZ @ 3521 NONAME ; QDeclarativeTranslate::~QDeclarativeTranslate(void)
+	??1QDeclarativeWorkerScript@@UAE@XZ @ 3522 NONAME ; QDeclarativeWorkerScript::~QDeclarativeWorkerScript(void)
+	??1Variant@QDeclarativeParser@@QAE@XZ @ 3523 NONAME ; QDeclarativeParser::Variant::~Variant(void)
+	??4Variant@QDeclarativeParser@@QAEAAV01@ABV01@@Z @ 3524 NONAME ; class QDeclarativeParser::Variant & QDeclarativeParser::Variant::operator=(class QDeclarativeParser::Variant const &)
+	??AQDeclarativeOpenMetaObject@@QAEAAVQVariant@@H@Z @ 3525 NONAME ; class QVariant & QDeclarativeOpenMetaObject::operator[](int)
+	??_EQDeclarativeItemPrivate@@UAE@I@Z @ 3526 NONAME ; QDeclarativeItemPrivate::~QDeclarativeItemPrivate(unsigned int)
+	??_EQDeclarativeSmoothedAnimation@@UAE@I@Z @ 3527 NONAME ; QDeclarativeSmoothedAnimation::~QDeclarativeSmoothedAnimation(unsigned int)
+	??_EQDeclarativeTranslate@@UAE@I@Z @ 3528 NONAME ; QDeclarativeTranslate::~QDeclarativeTranslate(unsigned int)
+	??_EQDeclarativeWorkerScript@@UAE@I@Z @ 3529 NONAME ; QDeclarativeWorkerScript::~QDeclarativeWorkerScript(unsigned int)
+	?addItemChangeListener@QDeclarativeItemPrivate@@QAEXPAVQDeclarativeItemChangeListener@@V?$QFlags@W4ChangeType@QDeclarativeItemPrivate@@@@@Z @ 3530 NONAME ; void QDeclarativeItemPrivate::addItemChangeListener(class QDeclarativeItemChangeListener *, class QFlags<enum QDeclarativeItemPrivate::ChangeType>)
+	?additionalActions@QDeclarativeAnchorChanges@@QAE?AV?$QList@VQDeclarativeAction@@@@XZ @ 3531 NONAME ; class QList<class QDeclarativeAction> QDeclarativeAnchorChanges::additionalActions(void)
+	?agent@QDeclarativeListModel@@QAEPAVQDeclarativeListModelWorkerAgent@@XZ @ 3532 NONAME ; class QDeclarativeListModelWorkerAgent * QDeclarativeListModel::agent(void)
+	?anchorLines@QDeclarativeItemPrivate@@QBEPAUAnchorLines@1@XZ @ 3533 NONAME ; struct QDeclarativeItemPrivate::AnchorLines * QDeclarativeItemPrivate::anchorLines(void) const
+	?anchors@QDeclarativeAnchorChanges@@QAEPAVQDeclarativeAnchorSet@@XZ @ 3534 NONAME ; class QDeclarativeAnchorSet * QDeclarativeAnchorChanges::anchors(void)
+	?anchors@QDeclarativeItemPrivate@@QAEPAVQDeclarativeAnchors@@XZ @ 3535 NONAME ; class QDeclarativeAnchors * QDeclarativeItemPrivate::anchors(void)
+	?animations@QDeclarativeTransition@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeAbstractAnimation@@@@XZ @ 3536 NONAME ; class QDeclarativeListProperty<class QDeclarativeAbstractAnimation> QDeclarativeTransition::animations(void)
+	?applyTo@QDeclarativeTranslate@@UBEXPAVQMatrix4x4@@@Z @ 3537 NONAME ; void QDeclarativeTranslate::applyTo(class QMatrix4x4 *) const
+	?asAST@Variant@QDeclarativeParser@@QBEPAVNode@AST@QDeclarativeJS@@XZ @ 3538 NONAME ; class QDeclarativeJS::AST::Node * QDeclarativeParser::Variant::asAST(void) const
+	?asBoolean@Variant@QDeclarativeParser@@QBE_NXZ @ 3539 NONAME ; bool QDeclarativeParser::Variant::asBoolean(void) const
+	?asNumber@Variant@QDeclarativeParser@@QBENXZ @ 3540 NONAME ; double QDeclarativeParser::Variant::asNumber(void) const
+	?asScript@Variant@QDeclarativeParser@@QBE?AVQString@@XZ @ 3541 NONAME ; class QString QDeclarativeParser::Variant::asScript(void) const
+	?asString@Variant@QDeclarativeParser@@QBE?AVQString@@XZ @ 3542 NONAME ; class QString QDeclarativeParser::Variant::asString(void) const
+	?asStringList@Variant@QDeclarativeParser@@QBE?AVQStringList@@XZ @ 3543 NONAME ; class QStringList QDeclarativeParser::Variant::asStringList(void) const
+	?back@QDeclarativeFlipable@@QAEPAVQGraphicsObject@@XZ @ 3544 NONAME ; class QGraphicsObject * QDeclarativeFlipable::back(void)
+	?baseline@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3545 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::baseline(void) const
+	?baseline@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3546 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::baseline(void) const
+	?baselineOffsetChanged@QDeclarativeItem@@IAEXM@Z @ 3547 NONAME ; void QDeclarativeItem::baselineOffsetChanged(float)
+	?bindingIndex@QDeclarativePropertyPrivate@@SAHABVQDeclarativeProperty@@@Z @ 3548 NONAME ; int QDeclarativePropertyPrivate::bindingIndex(class QDeclarativeProperty const &)
+	?bindingType@QDeclarativeAbstractBinding@@UBE?AW4Type@1@XZ @ 3549 NONAME ; enum QDeclarativeAbstractBinding::Type QDeclarativeAbstractBinding::bindingType(void) const
+	?bottom@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3550 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::bottom(void) const
+	?bottom@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3551 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::bottom(void) const
+	?buildPropertyOnAssignment@QDeclarativeCompiler@@AAE_NPAVProperty@QDeclarativeParser@@PAVObject@3@1PAVValue@3@ABUBindingContext@1@@Z @ 3552 NONAME ; bool QDeclarativeCompiler::buildPropertyOnAssignment(class QDeclarativeParser::Property *, class QDeclarativeParser::Object *, class QDeclarativeParser::Object *, class QDeclarativeParser::Value *, struct QDeclarativeCompiler::BindingContext const &)
+	?cacheBufferChanged@QDeclarativeGridView@@IAEXXZ @ 3553 NONAME ; void QDeclarativeGridView::cacheBufferChanged(void)
+	?cacheBufferChanged@QDeclarativeListView@@IAEXXZ @ 3554 NONAME ; void QDeclarativeListView::cacheBufferChanged(void)
+	?changes@QDeclarativeState@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeStateOperation@@@@XZ @ 3555 NONAME ; class QDeclarativeListProperty<class QDeclarativeStateOperation> QDeclarativeState::changes(void)
+	?checkValidId@QDeclarativeCompiler@@AAE_NPAVValue@QDeclarativeParser@@ABVQString@@@Z @ 3556 NONAME ; bool QDeclarativeCompiler::checkValidId(class QDeclarativeParser::Value *, class QString const &)
+	?children@QDeclarativeVisualItemModel@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeItem@@@@XZ @ 3557 NONAME ; class QDeclarativeListProperty<class QDeclarativeItem> QDeclarativeVisualItemModel::children(void)
+	?childrenRectChanged@QDeclarativeItem@@IAEXABVQRectF@@@Z @ 3558 NONAME ; void QDeclarativeItem::childrenRectChanged(class QRectF const &)
+	?clearBindings@QDeclarativeAnchorChanges@@UAEXXZ @ 3559 NONAME ; void QDeclarativeAnchorChanges::clearBindings(void)
+	?clipChanged@QDeclarativeItem@@IAEX_N@Z @ 3560 NONAME ; void QDeclarativeItem::clipChanged(bool)
+	?componentComplete@QDeclarativeWorkerScript@@MAEXXZ @ 3561 NONAME ; void QDeclarativeWorkerScript::componentComplete(void)
+	?computeTransformOrigin@QDeclarativeItemPrivate@@QBE?AVQPointF@@XZ @ 3562 NONAME ; class QPointF QDeclarativeItemPrivate::computeTransformOrigin(void) const
+	?contextObject@QDeclarativeContext@@QBEPAVQObject@@XZ @ 3563 NONAME ; class QObject * QDeclarativeContext::contextObject(void) const
+	?copyOriginals@QDeclarativeAnchorChanges@@UAEXPAVQDeclarativeActionEvent@@@Z @ 3564 NONAME ; void QDeclarativeAnchorChanges::copyOriginals(class QDeclarativeActionEvent *)
+	?copyOriginals@QDeclarativeParentChange@@UAEXPAVQDeclarativeActionEvent@@@Z @ 3565 NONAME ; void QDeclarativeParentChange::copyOriginals(class QDeclarativeActionEvent *)
+	?countChanged@QDeclarativeListModel@@IAEXXZ @ 3566 NONAME ; void QDeclarativeListModel::countChanged(void)
+	?countChanged@QDeclarativePathView@@IAEXXZ @ 3567 NONAME ; void QDeclarativePathView::countChanged(void)
+	?create@QDeclarativeType@@QBEXPAPAVQObject@@PAPAXI@Z @ 3568 NONAME ; void QDeclarativeType::create(class QObject * *, void * *, unsigned int) const
+	?currentTime@QDeclarativeItemPrivate@@SA?AVQTime@@XZ @ 3569 NONAME ; class QTime QDeclarativeItemPrivate::currentTime(void)
+	?d_func@QDeclarativeFocusPanel@@AAEPAVQDeclarativeItemPrivate@@XZ @ 3570 NONAME ; class QDeclarativeItemPrivate * QDeclarativeFocusPanel::d_func(void)
+	?d_func@QDeclarativeFocusPanel@@ABEPBVQDeclarativeItemPrivate@@XZ @ 3571 NONAME ; class QDeclarativeItemPrivate const * QDeclarativeFocusPanel::d_func(void) const
+	?d_func@QDeclarativeFocusScope@@AAEPAVQDeclarativeItemPrivate@@XZ @ 3572 NONAME ; class QDeclarativeItemPrivate * QDeclarativeFocusScope::d_func(void)
+	?d_func@QDeclarativeFocusScope@@ABEPBVQDeclarativeItemPrivate@@XZ @ 3573 NONAME ; class QDeclarativeItemPrivate const * QDeclarativeFocusScope::d_func(void) const
+	?d_func@QDeclarativeSmoothedAnimation@@AAEPAVQDeclarativeSmoothedAnimationPrivate@@XZ @ 3574 NONAME ; class QDeclarativeSmoothedAnimationPrivate * QDeclarativeSmoothedAnimation::d_func(void)
+	?d_func@QDeclarativeSmoothedAnimation@@ABEPBVQDeclarativeSmoothedAnimationPrivate@@XZ @ 3575 NONAME ; class QDeclarativeSmoothedAnimationPrivate const * QDeclarativeSmoothedAnimation::d_func(void) const
+	?d_func@QDeclarativeTranslate@@AAEPAVQDeclarativeTranslatePrivate@@XZ @ 3576 NONAME ; class QDeclarativeTranslatePrivate * QDeclarativeTranslate::d_func(void)
+	?d_func@QDeclarativeTranslate@@ABEPBVQDeclarativeTranslatePrivate@@XZ @ 3577 NONAME ; class QDeclarativeTranslatePrivate const * QDeclarativeTranslate::d_func(void) const
+	?data@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQObject@@@@XZ @ 3578 NONAME ; class QDeclarativeListProperty<class QObject> QDeclarativeItem::data(void)
+	?dataCleared@QDeclarativeXmlListModel@@AAEXXZ @ 3579 NONAME ; void QDeclarativeXmlListModel::dataCleared(void)
+	?data_append@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQObject@@@@PAVQObject@@@Z @ 3580 NONAME ; void QDeclarativeItemPrivate::data_append(class QDeclarativeListProperty<class QObject> *, class QObject *)
+	?delegateChanged@QDeclarativeGridView@@IAEXXZ @ 3581 NONAME ; void QDeclarativeGridView::delegateChanged(void)
+	?delegateChanged@QDeclarativeListView@@IAEXXZ @ 3582 NONAME ; void QDeclarativeListView::delegateChanged(void)
+	?delegateChanged@QDeclarativePathView@@IAEXXZ @ 3583 NONAME ; void QDeclarativePathView::delegateChanged(void)
+	?doPositioning@QDeclarativeColumn@@MAEXPAVQSizeF@@@Z @ 3584 NONAME ; void QDeclarativeColumn::doPositioning(class QSizeF *)
+	?doPositioning@QDeclarativeFlow@@MAEXPAVQSizeF@@@Z @ 3585 NONAME ; void QDeclarativeFlow::doPositioning(class QSizeF *)
+	?doPositioning@QDeclarativeGrid@@MAEXPAVQSizeF@@@Z @ 3586 NONAME ; void QDeclarativeGrid::doPositioning(class QSizeF *)
+	?doPositioning@QDeclarativeRow@@MAEXPAVQSizeF@@@Z @ 3587 NONAME ; void QDeclarativeRow::doPositioning(class QSizeF *)
+	?dragMarginChanged@QDeclarativePathView@@IAEXXZ @ 3588 NONAME ; void QDeclarativePathView::dragMarginChanged(void)
+	?duration@QDeclarativeSmoothedAnimation@@UBEHXZ @ 3589 NONAME ; int QDeclarativeSmoothedAnimation::duration(void) const
+	?elapsed@QDeclarativeItemPrivate@@SAHAAVQTime@@@Z @ 3590 NONAME ; int QDeclarativeItemPrivate::elapsed(class QTime &)
+	?evaluateEnum@QDeclarativeCompiler@@QBEHABVQByteArray@@@Z @ 3591 NONAME ; int QDeclarativeCompiler::evaluateEnum(class QByteArray const &) const
+	?evaluateEnum@QDeclarativeCustomParser@@IBEHABVQByteArray@@@Z @ 3592 NONAME ; int QDeclarativeCustomParser::evaluateEnum(class QByteArray const &) const
+	?event@QDeclarativeGridView@@MAE_NPAVQEvent@@@Z @ 3593 NONAME ; bool QDeclarativeGridView::event(class QEvent *)
+	?event@QDeclarativeListView@@MAE_NPAVQEvent@@@Z @ 3594 NONAME ; bool QDeclarativeListView::event(class QEvent *)
+	?event@QDeclarativeWorkerScript@@MAE_NPAVQEvent@@@Z @ 3595 NONAME ; bool QDeclarativeWorkerScript::event(class QEvent *)
+	?flatten@QDeclarativeListModel@@AAE_NXZ @ 3596 NONAME ; bool QDeclarativeListModel::flatten(void)
+	?flickDeceleration@QDeclarativePathView@@QBEMXZ @ 3597 NONAME ; float QDeclarativePathView::flickDeceleration(void) const
+	?flickDecelerationChanged@QDeclarativePathView@@IAEXXZ @ 3598 NONAME ; void QDeclarativePathView::flickDecelerationChanged(void)
+	?flickableChildren@QDeclarativeFlickable@@QAE?AV?$QDeclarativeListProperty@VQGraphicsObject@@@@XZ @ 3599 NONAME ; class QDeclarativeListProperty<class QGraphicsObject> QDeclarativeFlickable::flickableChildren(void)
+	?flickableData@QDeclarativeFlickable@@QAE?AV?$QDeclarativeListProperty@VQObject@@@@XZ @ 3600 NONAME ; class QDeclarativeListProperty<class QObject> QDeclarativeFlickable::flickableData(void)
+	?flowChanged@QDeclarativeGridView@@IAEXXZ @ 3601 NONAME ; void QDeclarativeGridView::flowChanged(void)
+	?focusChanged@QDeclarativeItem@@IAEX_N@Z @ 3602 NONAME ; void QDeclarativeItem::focusChanged(bool)
+	?focusChanged@QDeclarativeItemPrivate@@UAEX_N@Z @ 3603 NONAME ; void QDeclarativeItemPrivate::focusChanged(bool)
+	?footerChanged@QDeclarativeListView@@IAEXXZ @ 3604 NONAME ; void QDeclarativeListView::footerChanged(void)
+	?forcedHeight@QDeclarativePixmapReply@@QBEHXZ @ 3605 NONAME ; int QDeclarativePixmapReply::forcedHeight(void) const
+	?forcedWidth@QDeclarativePixmapReply@@QBEHXZ @ 3606 NONAME ; int QDeclarativePixmapReply::forcedWidth(void) const
+	?fromChanged@QDeclarativeTransition@@IAEXXZ @ 3607 NONAME ; void QDeclarativeTransition::fromChanged(void)
+	?front@QDeclarativeFlipable@@QAEPAVQGraphicsObject@@XZ @ 3608 NONAME ; class QGraphicsObject * QDeclarativeFlipable::front(void)
+	?geometryChanged@QDeclarativeFlickable@@MAEXABVQRectF@@0@Z @ 3609 NONAME ; void QDeclarativeFlickable::geometryChanged(class QRectF const &, class QRectF const &)
+	?get@QDeclarativePixmapCache@@SA?AW4Status@QDeclarativePixmapReply@@ABVQUrl@@PAVQPixmap@@PAVQSize@@_NHH@Z @ 3610 NONAME ; enum QDeclarativePixmapReply::Status QDeclarativePixmapCache::get(class QUrl const &, class QPixmap *, class QSize *, bool, int, int)
+	?getStaticMetaObject@QDeclarativeSmoothedAnimation@@SAABUQMetaObject@@XZ @ 3611 NONAME ; struct QMetaObject const & QDeclarativeSmoothedAnimation::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeTranslate@@SAABUQMetaObject@@XZ @ 3612 NONAME ; struct QMetaObject const & QDeclarativeTranslate::getStaticMetaObject(void)
+	?getStaticMetaObject@QDeclarativeWorkerScript@@SAABUQMetaObject@@XZ @ 3613 NONAME ; struct QMetaObject const & QDeclarativeWorkerScript::getStaticMetaObject(void)
+	?headerChanged@QDeclarativeListView@@IAEXXZ @ 3614 NONAME ; void QDeclarativeListView::headerChanged(void)
+	?height@QDeclarativeItemPrivate@@UBEMXZ @ 3615 NONAME ; float QDeclarativeItemPrivate::height(void) const
+	?highlight@QDeclarativePathView@@QBEPAVQDeclarativeComponent@@XZ @ 3616 NONAME ; class QDeclarativeComponent * QDeclarativePathView::highlight(void) const
+	?highlightChanged@QDeclarativePathView@@IAEXXZ @ 3617 NONAME ; void QDeclarativePathView::highlightChanged(void)
+	?highlightFollowsCurrentItemChanged@QDeclarativeListView@@IAEXXZ @ 3618 NONAME ; void QDeclarativeListView::highlightFollowsCurrentItemChanged(void)
+	?highlightItem@QDeclarativePathView@@QAEPAVQDeclarativeItem@@XZ @ 3619 NONAME ; class QDeclarativeItem * QDeclarativePathView::highlightItem(void)
+	?highlightItemChanged@QDeclarativeGridView@@IAEXXZ @ 3620 NONAME ; void QDeclarativeGridView::highlightItemChanged(void)
+	?highlightItemChanged@QDeclarativeListView@@IAEXXZ @ 3621 NONAME ; void QDeclarativeListView::highlightItemChanged(void)
+	?highlightItemChanged@QDeclarativePathView@@IAEXXZ @ 3622 NONAME ; void QDeclarativePathView::highlightItemChanged(void)
+	?highlightRangeMode@QDeclarativeGridView@@QBE?AW4HighlightRangeMode@1@XZ @ 3623 NONAME ; enum QDeclarativeGridView::HighlightRangeMode QDeclarativeGridView::highlightRangeMode(void) const
+	?highlightRangeMode@QDeclarativePathView@@QBE?AW4HighlightRangeMode@1@XZ @ 3624 NONAME ; enum QDeclarativePathView::HighlightRangeMode QDeclarativePathView::highlightRangeMode(void) const
+	?highlightRangeModeChanged@QDeclarativeGridView@@IAEXXZ @ 3625 NONAME ; void QDeclarativeGridView::highlightRangeModeChanged(void)
+	?highlightRangeModeChanged@QDeclarativeListView@@IAEXXZ @ 3626 NONAME ; void QDeclarativeListView::highlightRangeModeChanged(void)
+	?highlightRangeModeChanged@QDeclarativePathView@@IAEXXZ @ 3627 NONAME ; void QDeclarativePathView::highlightRangeModeChanged(void)
+	?horizontalCenter@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3628 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::horizontalCenter(void) const
+	?horizontalCenter@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3629 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::horizontalCenter(void) const
+	?idString@QDeclarativeDebugObjectReference@@QBE?AVQString@@XZ @ 3630 NONAME ; class QString QDeclarativeDebugObjectReference::idString(void) const
+	?implicitSize@QDeclarativePixmapReply@@QBE?AVQSize@@XZ @ 3631 NONAME ; class QSize QDeclarativePixmapReply::implicitSize(void) const
+	?importPathList@QDeclarativeEngine@@QBE?AVQStringList@@XZ @ 3632 NONAME ; class QStringList QDeclarativeEngine::importPathList(void) const
+	?indexAt@QDeclarativeGridView@@QBEHHH@Z @ 3633 NONAME ; int QDeclarativeGridView::indexAt(int, int) const
+	?indexAt@QDeclarativeListView@@QBEHHH@Z @ 3634 NONAME ; int QDeclarativeListView::indexAt(int, int) const
+	?init@QDeclarativeItemPrivate@@QAEXPAVQDeclarativeItem@@@Z @ 3635 NONAME ; void QDeclarativeItemPrivate::init(class QDeclarativeItem *)
+	?interactiveChanged@QDeclarativePathView@@IAEXXZ @ 3636 NONAME ; void QDeclarativePathView::interactiveChanged(void)
+	?intervalChanged@QDeclarativeTimer@@IAEXXZ @ 3637 NONAME ; void QDeclarativeTimer::intervalChanged(void)
+	?isBoolean@Variant@QDeclarativeParser@@QBE_NXZ @ 3638 NONAME ; bool QDeclarativeParser::Variant::isBoolean(void) const
+	?isCreatable@QDeclarativeType@@QBE_NXZ @ 3639 NONAME ; bool QDeclarativeType::isCreatable(void) const
+	?isInteractive@QDeclarativePathView@@QBE_NXZ @ 3640 NONAME ; bool QDeclarativePathView::isInteractive(void) const
+	?isKeyChanged@QDeclarativeXmlListModelRole@@IAEXXZ @ 3641 NONAME ; void QDeclarativeXmlListModelRole::isKeyChanged(void)
+	?isModule@QDeclarativeMetaType@@SA_NABVQByteArray@@HH@Z @ 3642 NONAME ; bool QDeclarativeMetaType::isModule(class QByteArray const &, int, int)
+	?isNumber@Variant@QDeclarativeParser@@QBE_NXZ @ 3643 NONAME ; bool QDeclarativeParser::Variant::isNumber(void) const
+	?isScript@Variant@QDeclarativeParser@@QBE_NXZ @ 3644 NONAME ; bool QDeclarativeParser::Variant::isScript(void) const
+	?isString@Variant@QDeclarativeParser@@QBE_NXZ @ 3645 NONAME ; bool QDeclarativeParser::Variant::isString(void) const
+	?isStringList@Variant@QDeclarativeParser@@QBE_NXZ @ 3646 NONAME ; bool QDeclarativeParser::Variant::isStringList(void) const
+	?isValueType@QDeclarativeValueTypeFactory@@SA_NH@Z @ 3647 NONAME ; bool QDeclarativeValueTypeFactory::isValueType(int)
+	?itemsMoved@QDeclarativePathView@@AAEXHHH@Z @ 3648 NONAME ; void QDeclarativePathView::itemsMoved(int, int, int)
+	?keyNavigationWrapsChanged@QDeclarativeGridView@@IAEXXZ @ 3649 NONAME ; void QDeclarativeGridView::keyNavigationWrapsChanged(void)
+	?keyNavigationWrapsChanged@QDeclarativeListView@@IAEXXZ @ 3650 NONAME ; void QDeclarativeListView::keyNavigationWrapsChanged(void)
+	?left@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3651 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::left(void) const
+	?left@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3652 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::left(void) const
+	?mapFromItem@QDeclarativeItem@@QBE?AVQScriptValue@@ABV2@MM@Z @ 3653 NONAME ; class QScriptValue QDeclarativeItem::mapFromItem(class QScriptValue const &, float, float) const
+	?mapToItem@QDeclarativeItem@@QBE?AVQScriptValue@@ABV2@MM@Z @ 3654 NONAME ; class QScriptValue QDeclarativeItem::mapToItem(class QScriptValue const &, float, float) const
+	?maximumEasingTime@QDeclarativeSmoothedAnimation@@QBEHXZ @ 3655 NONAME ; int QDeclarativeSmoothedAnimation::maximumEasingTime(void) const
+	?maximumEasingTimeChanged@QDeclarativeSmoothedAnimation@@IAEXXZ @ 3656 NONAME ; void QDeclarativeSmoothedAnimation::maximumEasingTimeChanged(void)
+	?message@QDeclarativeWorkerScript@@IAEXABVQScriptValue@@@Z @ 3657 NONAME ; void QDeclarativeWorkerScript::message(class QScriptValue const &)
+	?metaObject@QDeclarativeSmoothedAnimation@@UBEPBUQMetaObject@@XZ @ 3658 NONAME ; struct QMetaObject const * QDeclarativeSmoothedAnimation::metaObject(void) const
+	?metaObject@QDeclarativeTranslate@@UBEPBUQMetaObject@@XZ @ 3659 NONAME ; struct QMetaObject const * QDeclarativeTranslate::metaObject(void) const
+	?metaObject@QDeclarativeWorkerScript@@UBEPBUQMetaObject@@XZ @ 3660 NONAME ; struct QMetaObject const * QDeclarativeWorkerScript::metaObject(void) const
+	?modelChanged@QDeclarativeGridView@@IAEXXZ @ 3661 NONAME ; void QDeclarativeGridView::modelChanged(void)
+	?modelChanged@QDeclarativeListView@@IAEXXZ @ 3662 NONAME ; void QDeclarativeListView::modelChanged(void)
+	?modelChanged@QDeclarativePathView@@IAEXXZ @ 3663 NONAME ; void QDeclarativePathView::modelChanged(void)
+	?nameChanged@QDeclarativePathAttribute@@IAEXXZ @ 3664 NONAME ; void QDeclarativePathAttribute::nameChanged(void)
+	?nameChanged@QDeclarativeXmlListModelRole@@IAEXXZ @ 3665 NONAME ; void QDeclarativeXmlListModelRole::nameChanged(void)
+	?namespaceDeclarationsChanged@QDeclarativeXmlListModel@@IAEXXZ @ 3666 NONAME ; void QDeclarativeXmlListModel::namespaceDeclarationsChanged(void)
+	?objectOwnership@QDeclarativeEngine@@SA?AW4ObjectOwnership@1@PAVQObject@@@Z @ 3667 NONAME ; enum QDeclarativeEngine::ObjectOwnership QDeclarativeEngine::objectOwnership(class QObject *)
+	?parentChanged@QDeclarativeItem@@IAEXPAV1@@Z @ 3668 NONAME ; void QDeclarativeItem::parentChanged(class QDeclarativeItem *)
+	?parentProperty@QDeclarativeItemPrivate@@SAXPAVQObject@@PAXPAVQDeclarativeNotifierEndpoint@@@Z @ 3669 NONAME ; void QDeclarativeItemPrivate::parentProperty(class QObject *, void *, class QDeclarativeNotifierEndpoint *)
+	?pathChanged@QDeclarativePathView@@IAEXXZ @ 3670 NONAME ; void QDeclarativePathView::pathChanged(void)
+	?pathElements@QDeclarativePath@@QAE?AV?$QDeclarativeListProperty@VQDeclarativePathElement@@@@XZ @ 3671 NONAME ; class QDeclarativeListProperty<class QDeclarativePathElement> QDeclarativePath::pathElements(void)
+	?pathItemCountChanged@QDeclarativePathView@@IAEXXZ @ 3672 NONAME ; void QDeclarativePathView::pathItemCountChanged(void)
+	?pixmapChange@QDeclarativeImage@@MAEXXZ @ 3673 NONAME ; void QDeclarativeImage::pixmapChange(void)
+	?pixmapChange@QDeclarativeImageBase@@MAEXXZ @ 3674 NONAME ; void QDeclarativeImageBase::pixmapChange(void)
+	?pixmapChanged@QDeclarativeImage@@IAEXXZ @ 3675 NONAME ; void QDeclarativeImage::pixmapChanged(void)
+	?positionChanged@QDeclarativeTranslate@@IAEXXZ @ 3676 NONAME ; void QDeclarativeTranslate::positionChanged(void)
+	?positionViewAtIndex@QDeclarativeGridView@@QAEXHH@Z @ 3677 NONAME ; void QDeclarativeGridView::positionViewAtIndex(int, int)
+	?positionViewAtIndex@QDeclarativeListView@@QAEXHH@Z @ 3678 NONAME ; void QDeclarativeListView::positionViewAtIndex(int, int)
+	?preferredHighlightBegin@QDeclarativeGridView@@QBEMXZ @ 3679 NONAME ; float QDeclarativeGridView::preferredHighlightBegin(void) const
+	?preferredHighlightBegin@QDeclarativePathView@@QBEMXZ @ 3680 NONAME ; float QDeclarativePathView::preferredHighlightBegin(void) const
+	?preferredHighlightBeginChanged@QDeclarativeGridView@@IAEXXZ @ 3681 NONAME ; void QDeclarativeGridView::preferredHighlightBeginChanged(void)
+	?preferredHighlightBeginChanged@QDeclarativeListView@@IAEXXZ @ 3682 NONAME ; void QDeclarativeListView::preferredHighlightBeginChanged(void)
+	?preferredHighlightBeginChanged@QDeclarativePathView@@IAEXXZ @ 3683 NONAME ; void QDeclarativePathView::preferredHighlightBeginChanged(void)
+	?preferredHighlightEnd@QDeclarativeGridView@@QBEMXZ @ 3684 NONAME ; float QDeclarativeGridView::preferredHighlightEnd(void) const
+	?preferredHighlightEnd@QDeclarativePathView@@QBEMXZ @ 3685 NONAME ; float QDeclarativePathView::preferredHighlightEnd(void) const
+	?preferredHighlightEndChanged@QDeclarativeGridView@@IAEXXZ @ 3686 NONAME ; void QDeclarativeGridView::preferredHighlightEndChanged(void)
+	?preferredHighlightEndChanged@QDeclarativeListView@@IAEXXZ @ 3687 NONAME ; void QDeclarativeListView::preferredHighlightEndChanged(void)
+	?preferredHighlightEndChanged@QDeclarativePathView@@IAEXXZ @ 3688 NONAME ; void QDeclarativePathView::preferredHighlightEndChanged(void)
+	?propertyWritten@QDeclarativeOpenMetaObject@@MAEXH@Z @ 3689 NONAME ; void QDeclarativeOpenMetaObject::propertyWritten(int)
+	?q_func@QDeclarativeItemPrivate@@AAEPAVQDeclarativeItem@@XZ @ 3690 NONAME ; class QDeclarativeItem * QDeclarativeItemPrivate::q_func(void)
+	?q_func@QDeclarativeItemPrivate@@ABEPBVQDeclarativeItem@@XZ @ 3691 NONAME ; class QDeclarativeItem const * QDeclarativeItemPrivate::q_func(void) const
+	?qmlAttachedProperties@QDeclarativePathView@@SAPAVQDeclarativePathViewAttached@@PAVQObject@@@Z @ 3692 NONAME ; class QDeclarativePathViewAttached * QDeclarativePathView::qmlAttachedProperties(class QObject *)
+	?qtAnimation@QDeclarativeSmoothedAnimation@@UAEPAVQAbstractAnimation@@XZ @ 3693 NONAME ; class QAbstractAnimation * QDeclarativeSmoothedAnimation::qtAnimation(void)
+	?qt_metacall@QDeclarativeSmoothedAnimation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 3694 NONAME ; int QDeclarativeSmoothedAnimation::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeTranslate@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 3695 NONAME ; int QDeclarativeTranslate::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@QDeclarativeWorkerScript@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 3696 NONAME ; int QDeclarativeWorkerScript::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacast@QDeclarativeSmoothedAnimation@@UAEPAXPBD@Z @ 3697 NONAME ; void * QDeclarativeSmoothedAnimation::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeTranslate@@UAEPAXPBD@Z @ 3698 NONAME ; void * QDeclarativeTranslate::qt_metacast(char const *)
+	?qt_metacast@QDeclarativeWorkerScript@@UAEPAXPBD@Z @ 3699 NONAME ; void * QDeclarativeWorkerScript::qt_metacast(char const *)
+	?queryChanged@QDeclarativeXmlListModel@@IAEXXZ @ 3700 NONAME ; void QDeclarativeXmlListModel::queryChanged(void)
+	?queryChanged@QDeclarativeXmlListModelRole@@IAEXXZ @ 3701 NONAME ; void QDeclarativeXmlListModelRole::queryChanged(void)
+	?queryCompleted@QDeclarativeXmlListModel@@AAEXABUQDeclarativeXmlQueryResult@@@Z @ 3702 NONAME ; void QDeclarativeXmlListModel::queryCompleted(struct QDeclarativeXmlQueryResult const &)
+	?registerValueTypes@QDeclarativeValueTypeFactory@@SAXXZ @ 3703 NONAME ; void QDeclarativeValueTypeFactory::registerValueTypes(void)
+	?removeItemChangeListener@QDeclarativeItemPrivate@@QAEXPAVQDeclarativeItemChangeListener@@V?$QFlags@W4ChangeType@QDeclarativeItemPrivate@@@@@Z @ 3704 NONAME ; void QDeclarativeItemPrivate::removeItemChangeListener(class QDeclarativeItemChangeListener *, class QFlags<enum QDeclarativeItemPrivate::ChangeType>)
+	?repeatChanged@QDeclarativeTimer@@IAEXXZ @ 3705 NONAME ; void QDeclarativeTimer::repeatChanged(void)
+	?request@QDeclarativePixmapCache@@SAPAVQDeclarativePixmapReply@@PAVQDeclarativeEngine@@ABVQUrl@@HH@Z @ 3706 NONAME ; class QDeclarativePixmapReply * QDeclarativePixmapCache::request(class QDeclarativeEngine *, class QUrl const &, int, int)
+	?resetHeight@QDeclarativeItemPrivate@@UAEXXZ @ 3707 NONAME ; void QDeclarativeItemPrivate::resetHeight(void)
+	?resetWidth@QDeclarativeItemPrivate@@UAEXXZ @ 3708 NONAME ; void QDeclarativeItemPrivate::resetWidth(void)
+	?resources@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQObject@@@@XZ @ 3709 NONAME ; class QDeclarativeListProperty<class QObject> QDeclarativeItem::resources(void)
+	?resources_append@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQObject@@@@PAVQObject@@@Z @ 3710 NONAME ; void QDeclarativeItemPrivate::resources_append(class QDeclarativeListProperty<class QObject> *, class QObject *)
+	?resources_at@QDeclarativeItemPrivate@@SAPAVQObject@@PAV?$QDeclarativeListProperty@VQObject@@@@H@Z @ 3711 NONAME ; class QObject * QDeclarativeItemPrivate::resources_at(class QDeclarativeListProperty<class QObject> *, int)
+	?resources_count@QDeclarativeItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQObject@@@@@Z @ 3712 NONAME ; int QDeclarativeItemPrivate::resources_count(class QDeclarativeListProperty<class QObject> *)
+	?restart@QDeclarativeItemPrivate@@SAHAAVQTime@@@Z @ 3713 NONAME ; int QDeclarativeItemPrivate::restart(class QTime &)
+	?restore@QDeclarativePropertyPrivate@@SA?AVQDeclarativeProperty@@ABVQByteArray@@PAVQObject@@PAVQDeclarativeContextData@@@Z @ 3714 NONAME ; class QDeclarativeProperty QDeclarativePropertyPrivate::restore(class QByteArray const &, class QObject *, class QDeclarativeContextData *)
+	?reversibleChanged@QDeclarativeTransition@@IAEXXZ @ 3715 NONAME ; void QDeclarativeTransition::reversibleChanged(void)
+	?reversingMode@QDeclarativeSmoothedAnimation@@QBE?AW4ReversingMode@1@XZ @ 3716 NONAME ; enum QDeclarativeSmoothedAnimation::ReversingMode QDeclarativeSmoothedAnimation::reversingMode(void) const
+	?reversingModeChanged@QDeclarativeSmoothedAnimation@@IAEXXZ @ 3717 NONAME ; void QDeclarativeSmoothedAnimation::reversingModeChanged(void)
+	?right@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3718 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::right(void) const
+	?right@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3719 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::right(void) const
+	?roleObjects@QDeclarativeXmlListModel@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeXmlListModelRole@@@@XZ @ 3720 NONAME ; class QDeclarativeListProperty<class QDeclarativeXmlListModelRole> QDeclarativeXmlListModel::roleObjects(void)
+	?saveTargetValues@QDeclarativeAnchorChanges@@UAEXXZ @ 3721 NONAME ; void QDeclarativeAnchorChanges::saveTargetValues(void)
+	?sendMessage@QDeclarativeWorkerScript@@QAEXABVQScriptValue@@@Z @ 3722 NONAME ; void QDeclarativeWorkerScript::sendMessage(class QScriptValue const &)
+	?setBack@QDeclarativeFlipable@@QAEXPAVQGraphicsObject@@@Z @ 3723 NONAME ; void QDeclarativeFlipable::setBack(class QGraphicsObject *)
+	?setBaseline@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3724 NONAME ; void QDeclarativeAnchors::setBaseline(struct QDeclarativeAnchorLine const &)
+	?setBinding@QDeclarativePropertyPrivate@@SAPAVQDeclarativeAbstractBinding@@PAVQObject@@HHPAV2@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3725 NONAME ; class QDeclarativeAbstractBinding * QDeclarativePropertyPrivate::setBinding(class QObject *, int, int, class QDeclarativeAbstractBinding *, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
+	?setBottom@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3726 NONAME ; void QDeclarativeAnchors::setBottom(struct QDeclarativeAnchorLine const &)
+	?setContextObject@QDeclarativeContext@@QAEXPAVQObject@@@Z @ 3727 NONAME ; void QDeclarativeContext::setContextObject(class QObject *)
+	?setDuration@QDeclarativeSmoothedAnimation@@UAEXH@Z @ 3728 NONAME ; void QDeclarativeSmoothedAnimation::setDuration(int)
+	?setFlickDeceleration@QDeclarativePathView@@QAEXM@Z @ 3729 NONAME ; void QDeclarativePathView::setFlickDeceleration(float)
+	?setFront@QDeclarativeFlipable@@QAEXPAVQGraphicsObject@@@Z @ 3730 NONAME ; void QDeclarativeFlipable::setFront(class QGraphicsObject *)
+	?setHeight@QDeclarativeItemPrivate@@UAEXM@Z @ 3731 NONAME ; void QDeclarativeItemPrivate::setHeight(float)
+	?setHighlight@QDeclarativePathView@@QAEXPAVQDeclarativeComponent@@@Z @ 3732 NONAME ; void QDeclarativePathView::setHighlight(class QDeclarativeComponent *)
+	?setHighlightRangeMode@QDeclarativeGridView@@QAEXW4HighlightRangeMode@1@@Z @ 3733 NONAME ; void QDeclarativeGridView::setHighlightRangeMode(enum QDeclarativeGridView::HighlightRangeMode)
+	?setHighlightRangeMode@QDeclarativePathView@@QAEXW4HighlightRangeMode@1@@Z @ 3734 NONAME ; void QDeclarativePathView::setHighlightRangeMode(enum QDeclarativePathView::HighlightRangeMode)
+	?setHorizontalCenter@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3735 NONAME ; void QDeclarativeAnchors::setHorizontalCenter(struct QDeclarativeAnchorLine const &)
+	?setImportPathList@QDeclarativeEngine@@QAEXABVQStringList@@@Z @ 3736 NONAME ; void QDeclarativeEngine::setImportPathList(class QStringList const &)
+	?setInteractive@QDeclarativePathView@@QAEX_N@Z @ 3737 NONAME ; void QDeclarativePathView::setInteractive(bool)
+	?setLeft@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3738 NONAME ; void QDeclarativeAnchors::setLeft(struct QDeclarativeAnchorLine const &)
+	?setMaximumEasingTime@QDeclarativeSmoothedAnimation@@QAEXH@Z @ 3739 NONAME ; void QDeclarativeSmoothedAnimation::setMaximumEasingTime(int)
+	?setObjectOwnership@QDeclarativeEngine@@SAXPAVQObject@@W4ObjectOwnership@1@@Z @ 3740 NONAME ; void QDeclarativeEngine::setObjectOwnership(class QObject *, enum QDeclarativeEngine::ObjectOwnership)
+	?setPosHelper@QDeclarativeItemPrivate@@UAEXABVQPointF@@@Z @ 3741 NONAME ; void QDeclarativeItemPrivate::setPosHelper(class QPointF const &)
+	?setPreferredHighlightBegin@QDeclarativeGridView@@QAEXM@Z @ 3742 NONAME ; void QDeclarativeGridView::setPreferredHighlightBegin(float)
+	?setPreferredHighlightBegin@QDeclarativePathView@@QAEXM@Z @ 3743 NONAME ; void QDeclarativePathView::setPreferredHighlightBegin(float)
+	?setPreferredHighlightEnd@QDeclarativeGridView@@QAEXM@Z @ 3744 NONAME ; void QDeclarativeGridView::setPreferredHighlightEnd(float)
+	?setPreferredHighlightEnd@QDeclarativePathView@@QAEXM@Z @ 3745 NONAME ; void QDeclarativePathView::setPreferredHighlightEnd(float)
+	?setReversingMode@QDeclarativeSmoothedAnimation@@QAEXW4ReversingMode@1@@Z @ 3746 NONAME ; void QDeclarativeSmoothedAnimation::setReversingMode(enum QDeclarativeSmoothedAnimation::ReversingMode)
+	?setRight@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3747 NONAME ; void QDeclarativeAnchors::setRight(struct QDeclarativeAnchorLine const &)
+	?setSize@QDeclarativeItem@@QAEXABVQSizeF@@@Z @ 3748 NONAME ; void QDeclarativeItem::setSize(class QSizeF const &)
+	?setSnapMode@QDeclarativeGridView@@QAEXW4SnapMode@1@@Z @ 3749 NONAME ; void QDeclarativeGridView::setSnapMode(enum QDeclarativeGridView::SnapMode)
+	?setSource@QDeclarativeWorkerScript@@QAEXABVQUrl@@@Z @ 3750 NONAME ; void QDeclarativeWorkerScript::setSource(class QUrl const &)
+	?setSourceSize@QDeclarativeImageBase@@QAEXABVQSize@@@Z @ 3751 NONAME ; void QDeclarativeImageBase::setSourceSize(class QSize const &)
+	?setTarget@QDeclarativeDrag@@QAEXPAVQGraphicsObject@@@Z @ 3752 NONAME ; void QDeclarativeDrag::setTarget(class QGraphicsObject *)
+	?setTop@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3753 NONAME ; void QDeclarativeAnchors::setTop(struct QDeclarativeAnchorLine const &)
+	?setVelocity@QDeclarativeSmoothedAnimation@@QAEXM@Z @ 3754 NONAME ; void QDeclarativeSmoothedAnimation::setVelocity(float)
+	?setVerticalCenter@QDeclarativeAnchors@@QAEXABUQDeclarativeAnchorLine@@@Z @ 3755 NONAME ; void QDeclarativeAnchors::setVerticalCenter(struct QDeclarativeAnchorLine const &)
+	?setWidth@QDeclarativeItemPrivate@@UAEXM@Z @ 3756 NONAME ; void QDeclarativeItemPrivate::setWidth(float)
+	?setX@QDeclarativeTranslate@@QAEXM@Z @ 3757 NONAME ; void QDeclarativeTranslate::setX(float)
+	?setY@QDeclarativeTranslate@@QAEXM@Z @ 3758 NONAME ; void QDeclarativeTranslate::setY(float)
+	?siblingOrderChange@QDeclarativeItemPrivate@@UAEXXZ @ 3759 NONAME ; void QDeclarativeItemPrivate::siblingOrderChange(void)
+	?smoothChanged@QDeclarativeItem@@IAEX_N@Z @ 3760 NONAME ; void QDeclarativeItem::smoothChanged(bool)
+	?snapMode@QDeclarativeGridView@@QBE?AW4SnapMode@1@XZ @ 3761 NONAME ; enum QDeclarativeGridView::SnapMode QDeclarativeGridView::snapMode(void) const
+	?snapModeChanged@QDeclarativeGridView@@IAEXXZ @ 3762 NONAME ; void QDeclarativeGridView::snapModeChanged(void)
+	?snapModeChanged@QDeclarativeListView@@IAEXXZ @ 3763 NONAME ; void QDeclarativeListView::snapModeChanged(void)
+	?snapPositionChanged@QDeclarativePathView@@IAEXXZ @ 3764 NONAME ; void QDeclarativePathView::snapPositionChanged(void)
+	?source@QDeclarativeWorkerScript@@QBE?AVQUrl@@XZ @ 3765 NONAME ; class QUrl QDeclarativeWorkerScript::source(void) const
+	?sourceChanged@QDeclarativeWorkerScript@@IAEXXZ @ 3766 NONAME ; void QDeclarativeWorkerScript::sourceChanged(void)
+	?sourceChanged@QDeclarativeXmlListModel@@IAEXXZ @ 3767 NONAME ; void QDeclarativeXmlListModel::sourceChanged(void)
+	?sourceSize@QDeclarativeImageBase@@QBE?AVQSize@@XZ @ 3768 NONAME ; class QSize QDeclarativeImageBase::sourceSize(void) const
+	?sourceSizeChanged@QDeclarativeImageBase@@IAEXXZ @ 3769 NONAME ; void QDeclarativeImageBase::sourceSizeChanged(void)
+	?start@QDeclarativeItemPrivate@@SAXAAVQTime@@@Z @ 3770 NONAME ; void QDeclarativeItemPrivate::start(class QTime &)
+	?startXChanged@QDeclarativePath@@IAEXXZ @ 3771 NONAME ; void QDeclarativePath::startXChanged(void)
+	?startYChanged@QDeclarativePath@@IAEXXZ @ 3772 NONAME ; void QDeclarativePath::startYChanged(void)
+	?states@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 3773 NONAME ; class QDeclarativeListProperty<class QDeclarativeState> QDeclarativeItem::states(void)
+	?states@QDeclarativeItemPrivate@@QAEPAVQDeclarativeStateGroup@@XZ @ 3774 NONAME ; class QDeclarativeStateGroup * QDeclarativeItemPrivate::states(void)
+	?statesProperty@QDeclarativeStateGroup@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeState@@@@XZ @ 3775 NONAME ; class QDeclarativeListProperty<class QDeclarativeState> QDeclarativeStateGroup::statesProperty(void)
+	?stops@QDeclarativeGradient@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeGradientStop@@@@XZ @ 3776 NONAME ; class QDeclarativeListProperty<class QDeclarativeGradientStop> QDeclarativeGradient::stops(void)
+	?subFocusItemChange@QDeclarativeItemPrivate@@UAEXXZ @ 3777 NONAME ; void QDeclarativeItemPrivate::subFocusItemChange(void)
+	?sync@QDeclarativeListModel@@QAEXXZ @ 3778 NONAME ; void QDeclarativeListModel::sync(void)
+	?target@QDeclarativeDrag@@QBEPAVQGraphicsObject@@XZ @ 3779 NONAME ; class QGraphicsObject * QDeclarativeDrag::target(void) const
+	?toChanged@QDeclarativeTransition@@IAEXXZ @ 3780 NONAME ; void QDeclarativeTransition::toChanged(void)
+	?top@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3781 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::top(void) const
+	?top@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3782 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::top(void) const
+	?tr@QDeclarativeSmoothedAnimation@@SA?AVQString@@PBD0@Z @ 3783 NONAME ; class QString QDeclarativeSmoothedAnimation::tr(char const *, char const *)
+	?tr@QDeclarativeSmoothedAnimation@@SA?AVQString@@PBD0H@Z @ 3784 NONAME ; class QString QDeclarativeSmoothedAnimation::tr(char const *, char const *, int)
+	?tr@QDeclarativeTranslate@@SA?AVQString@@PBD0@Z @ 3785 NONAME ; class QString QDeclarativeTranslate::tr(char const *, char const *)
+	?tr@QDeclarativeTranslate@@SA?AVQString@@PBD0H@Z @ 3786 NONAME ; class QString QDeclarativeTranslate::tr(char const *, char const *, int)
+	?tr@QDeclarativeWorkerScript@@SA?AVQString@@PBD0@Z @ 3787 NONAME ; class QString QDeclarativeWorkerScript::tr(char const *, char const *)
+	?tr@QDeclarativeWorkerScript@@SA?AVQString@@PBD0H@Z @ 3788 NONAME ; class QString QDeclarativeWorkerScript::tr(char const *, char const *, int)
+	?trUtf8@QDeclarativeSmoothedAnimation@@SA?AVQString@@PBD0@Z @ 3789 NONAME ; class QString QDeclarativeSmoothedAnimation::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeSmoothedAnimation@@SA?AVQString@@PBD0H@Z @ 3790 NONAME ; class QString QDeclarativeSmoothedAnimation::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeTranslate@@SA?AVQString@@PBD0@Z @ 3791 NONAME ; class QString QDeclarativeTranslate::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeTranslate@@SA?AVQString@@PBD0H@Z @ 3792 NONAME ; class QString QDeclarativeTranslate::trUtf8(char const *, char const *, int)
+	?trUtf8@QDeclarativeWorkerScript@@SA?AVQString@@PBD0@Z @ 3793 NONAME ; class QString QDeclarativeWorkerScript::trUtf8(char const *, char const *)
+	?trUtf8@QDeclarativeWorkerScript@@SA?AVQString@@PBD0H@Z @ 3794 NONAME ; class QString QDeclarativeWorkerScript::trUtf8(char const *, char const *, int)
+	?transform@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQGraphicsTransform@@@@XZ @ 3795 NONAME ; class QDeclarativeListProperty<class QGraphicsTransform> QDeclarativeItem::transform(void)
+	?transform_append@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsTransform@@@@PAVQGraphicsTransform@@@Z @ 3796 NONAME ; void QDeclarativeItemPrivate::transform_append(class QDeclarativeListProperty<class QGraphicsTransform> *, class QGraphicsTransform *)
+	?transform_at@QDeclarativeItemPrivate@@SAPAVQGraphicsTransform@@PAV?$QDeclarativeListProperty@VQGraphicsTransform@@@@H@Z @ 3797 NONAME ; class QGraphicsTransform * QDeclarativeItemPrivate::transform_at(class QDeclarativeListProperty<class QGraphicsTransform> *, int)
+	?transform_clear@QDeclarativeItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsTransform@@@@@Z @ 3798 NONAME ; void QDeclarativeItemPrivate::transform_clear(class QDeclarativeListProperty<class QGraphicsTransform> *)
+	?transform_count@QDeclarativeItemPrivate@@SAHPAV?$QDeclarativeListProperty@VQGraphicsTransform@@@@@Z @ 3799 NONAME ; int QDeclarativeItemPrivate::transform_count(class QDeclarativeListProperty<class QGraphicsTransform> *)
+	?transition@QDeclarativeSmoothedAnimation@@UAEXAAV?$QList@VQDeclarativeAction@@@@AAV?$QList@VQDeclarativeProperty@@@@W4TransitionDirection@QDeclarativeAbstractAnimation@@@Z @ 3800 NONAME ; void QDeclarativeSmoothedAnimation::transition(class QList<class QDeclarativeAction> &, class QList<class QDeclarativeProperty> &, enum QDeclarativeAbstractAnimation::TransitionDirection)
+	?transitions@QDeclarativeItem@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 3801 NONAME ; class QDeclarativeListProperty<class QDeclarativeTransition> QDeclarativeItem::transitions(void)
+	?transitionsProperty@QDeclarativeStateGroup@@QAE?AV?$QDeclarativeListProperty@VQDeclarativeTransition@@@@XZ @ 3802 NONAME ; class QDeclarativeListProperty<class QDeclarativeTransition> QDeclarativeStateGroup::transitionsProperty(void)
+	?triggeredOnStartChanged@QDeclarativeTimer@@IAEXXZ @ 3803 NONAME ; void QDeclarativeTimer::triggeredOnStartChanged(void)
+	?type@Variant@QDeclarativeParser@@QBE?AW4Type@12@XZ @ 3804 NONAME ; enum QDeclarativeParser::Variant::Type QDeclarativeParser::Variant::type(void) const
+	?valueChanged@QDeclarativePropertyMap@@IAEXABVQString@@ABVQVariant@@@Z @ 3805 NONAME ; void QDeclarativePropertyMap::valueChanged(class QString const &, class QVariant const &)
+	?velocity@QDeclarativeSmoothedAnimation@@QBEMXZ @ 3806 NONAME ; float QDeclarativeSmoothedAnimation::velocity(void) const
+	?velocityChanged@QDeclarativeSmoothedAnimation@@IAEXXZ @ 3807 NONAME ; void QDeclarativeSmoothedAnimation::velocityChanged(void)
+	?verticalCenter@QDeclarativeAnchors@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3808 NONAME ; struct QDeclarativeAnchorLine QDeclarativeAnchors::verticalCenter(void) const
+	?verticalCenter@QDeclarativeItem@@QBE?AUQDeclarativeAnchorLine@@XZ @ 3809 NONAME ; struct QDeclarativeAnchorLine QDeclarativeItem::verticalCenter(void) const
+	?wantsFocusChanged@QDeclarativeItem@@IAEX_N@Z @ 3810 NONAME ; void QDeclarativeItem::wantsFocusChanged(bool)
+	?width@QDeclarativeItemPrivate@@UBEMXZ @ 3811 NONAME ; float QDeclarativeItemPrivate::width(void) const
+	?write@QDeclarativePropertyPrivate@@SA_NPAVQObject@@ABUData@QDeclarativePropertyCache@@ABVQVariant@@PAVQDeclarativeContextData@@V?$QFlags@W4WriteFlag@QDeclarativePropertyPrivate@@@@@Z @ 3812 NONAME ; bool QDeclarativePropertyPrivate::write(class QObject *, struct QDeclarativePropertyCache::Data const &, class QVariant const &, class QDeclarativeContextData *, class QFlags<enum QDeclarativePropertyPrivate::WriteFlag>)
+	?x@QDeclarativeTranslate@@QBEMXZ @ 3813 NONAME ; float QDeclarativeTranslate::x(void) const
+	?xmlChanged@QDeclarativeXmlListModel@@IAEXXZ @ 3814 NONAME ; void QDeclarativeXmlListModel::xmlChanged(void)
+	?y@QDeclarativeTranslate@@QBEMXZ @ 3815 NONAME ; float QDeclarativeTranslate::y(void) const
+	?staticMetaObject@QDeclarativeWorkerScript@@2UQMetaObject@@B @ 3816 NONAME ; struct QMetaObject const QDeclarativeWorkerScript::staticMetaObject
+	?staticMetaObject@QDeclarativeSmoothedAnimation@@2UQMetaObject@@B @ 3817 NONAME ; struct QMetaObject const QDeclarativeSmoothedAnimation::staticMetaObject
+	?staticMetaObject@QDeclarativeTranslate@@2UQMetaObject@@B @ 3818 NONAME ; struct QMetaObject const QDeclarativeTranslate::staticMetaObject
+	?consistentTime@QDeclarativeItemPrivate@@2HA @ 3819 NONAME ; int QDeclarativeItemPrivate::consistentTime
 
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 875fe8c..1c33477 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -3853,7 +3853,7 @@ EXPORTS
 	?draw@QLineControl@@QAEXPAVQPainter@@ABVQPoint@@ABVQRect@@H@Z @ 3852 NONAME ; void QLineControl::draw(class QPainter *, class QPoint const &, class QRect const &, int)
 	?draw@QPaintBuffer@@QBEXPAVQPainter@@H@Z @ 3853 NONAME ; void QPaintBuffer::draw(class QPainter *, int) const
 	?draw@QPaintEngineEx@@UAEXABVQVectorPath@@@Z @ 3854 NONAME ; void QPaintEngineEx::draw(class QVectorPath const &)
-	?draw@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@H@Z @ 3855 NONAME ; void QPainterReplayer::draw(class QPaintBuffer const &, class QPainter *, int)
+	?draw@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@H@Z @ 3855 NONAME ABSENT ; void QPainterReplayer::draw(class QPaintBuffer const &, class QPainter *, int)
 	?draw@QPixmapBlurFilter@@UBEXPAVQPainter@@ABVQPointF@@ABVQPixmap@@ABVQRectF@@@Z @ 3856 NONAME ; void QPixmapBlurFilter::draw(class QPainter *, class QPointF const &, class QPixmap const &, class QRectF const &) const
 	?draw@QPixmapColorizeFilter@@UBEXPAVQPainter@@ABVQPointF@@ABVQPixmap@@ABVQRectF@@@Z @ 3857 NONAME ; void QPixmapColorizeFilter::draw(class QPainter *, class QPointF const &, class QPixmap const &, class QRectF const &) const
 	?draw@QPixmapConvolutionFilter@@UBEXPAVQPainter@@ABVQPointF@@ABVQPixmap@@ABVQRectF@@@Z @ 3858 NONAME ; void QPixmapConvolutionFilter::draw(class QPainter *, class QPointF const &, class QPixmap const &, class QRectF const &) const
@@ -3961,7 +3961,7 @@ EXPORTS
 	?drawPixmap@QPainter@@QAEXHHABVQPixmap@@HHHH@Z @ 3960 NONAME ; void QPainter::drawPixmap(int, int, class QPixmap const &, int, int, int, int)
 	?drawPixmap@QPainter@@QAEXHHHHABVQPixmap@@@Z @ 3961 NONAME ; void QPainter::drawPixmap(int, int, int, int, class QPixmap const &)
 	?drawPixmap@QPainter@@QAEXHHHHABVQPixmap@@HHHH@Z @ 3962 NONAME ; void QPainter::drawPixmap(int, int, int, int, class QPixmap const &, int, int, int, int)
-	?drawPixmaps@QPaintEngineEx@@UAEXPBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 3963 NONAME ; void QPaintEngineEx::drawPixmaps(struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
+	?drawPixmaps@QPaintEngineEx@@UAEXPBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 3963 NONAME ABSENT ; void QPaintEngineEx::drawPixmaps(struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
 	?drawPoint@QPainter@@QAEXABVQPoint@@@Z @ 3964 NONAME ; void QPainter::drawPoint(class QPoint const &)
 	?drawPoint@QPainter@@QAEXABVQPointF@@@Z @ 3965 NONAME ; void QPainter::drawPoint(class QPointF const &)
 	?drawPoint@QPainter@@QAEXHH@Z @ 3966 NONAME ; void QPainter::drawPoint(int, int)
@@ -7206,10 +7206,10 @@ EXPORTS
 	?parseTerm@Parser@QCss@@QAE_NPAUValue@2@@Z @ 7205 NONAME ; bool QCss::Parser::parseTerm(struct QCss::Value *)
 	?passwordCharacter@QLineControl@@QBE?AVQChar@@XZ @ 7206 NONAME ; class QChar QLineControl::passwordCharacter(void) const
 	?passwordEchoEditing@QLineControl@@QBE_NXZ @ 7207 NONAME ; bool QLineControl::passwordEchoEditing(void) const
-	?paste@QLineControl@@QAEXXZ @ 7208 NONAME ; void QLineControl::paste(void)
+	?paste@QLineControl@@QAEXXZ @ 7208 NONAME ABSENT ; void QLineControl::paste(void)
 	?paste@QLineEdit@@QAEXXZ @ 7209 NONAME ; void QLineEdit::paste(void)
 	?paste@QPlainTextEdit@@QAEXXZ @ 7210 NONAME ; void QPlainTextEdit::paste(void)
-	?paste@QTextControl@@QAEXXZ @ 7211 NONAME ; void QTextControl::paste(void)
+	?paste@QTextControl@@QAEXXZ @ 7211 NONAME ABSENT ; void QTextControl::paste(void)
 	?paste@QTextEdit@@QAEXXZ @ 7212 NONAME ; void QTextEdit::paste(void)
 	?path@QGraphicsPathItem@@QBE?AVQPainterPath@@XZ @ 7213 NONAME ; class QPainterPath QGraphicsPathItem::path(void) const
 	?pathFromIndex@QCompleter@@UBE?AVQString@@ABVQModelIndex@@@Z @ 7214 NONAME ; class QString QCompleter::pathFromIndex(class QModelIndex const &) const
@@ -7291,7 +7291,7 @@ EXPORTS
 	?polishEvent@QGraphicsWidget@@MAEXXZ @ 7290 NONAME ; void QGraphicsWidget::polishEvent(void)
 	?polygon@QGraphicsPolygonItem@@QBE?AVQPolygonF@@XZ @ 7291 NONAME ; class QPolygonF QGraphicsPolygonItem::polygon(void) const
 	?polygonFlags@QVectorPath@@SAIW4PolygonDrawMode@QPaintEngine@@@Z @ 7292 NONAME ; unsigned int QVectorPath::polygonFlags(enum QPaintEngine::PolygonDrawMode)
-	?populate@QTextureGlyphCache@@QAEXABVQTextItemInt@@ABV?$QVarLengthArray@I$0BAA@@@ABV?$QVarLengthArray@UQFixedPoint@@$0BAA@@@@Z @ 7293 NONAME ; void QTextureGlyphCache::populate(class QTextItemInt const &, class QVarLengthArray<unsigned int, 256> const &, class QVarLengthArray<struct QFixedPoint, 256> const &)
+	?populate@QTextureGlyphCache@@QAEXABVQTextItemInt@@ABV?$QVarLengthArray@I$0BAA@@@ABV?$QVarLengthArray@UQFixedPoint@@$0BAA@@@@Z @ 7293 NONAME ABSENT ; void QTextureGlyphCache::populate(class QTextItemInt const &, class QVarLengthArray<unsigned int, 256> const &, class QVarLengthArray<struct QFixedPoint, 256> const &)
 	?popup@QCompleter@@QBEPAVQAbstractItemView@@XZ @ 7294 NONAME ; class QAbstractItemView * QCompleter::popup(void) const
 	?popup@QMenu@@QAEXABVQPoint@@PAVQAction@@@Z @ 7295 NONAME ; void QMenu::popup(class QPoint const &, class QAction *)
 	?popupMode@QToolButton@@QBE?AW4ToolButtonPopupMode@1@XZ @ 7296 NONAME ; enum QToolButton::ToolButtonPopupMode QToolButton::popupMode(void) const
@@ -7389,7 +7389,7 @@ EXPORTS
 	?qAlpha@@YAHI@Z @ 7388 NONAME ; int qAlpha(unsigned int)
 	?qBlue@@YAHI@Z @ 7389 NONAME ; int qBlue(unsigned int)
 	?qDrawBorderPixmap@@YAXPAVQPainter@@ABVQRect@@ABVQMargins@@ABVQPixmap@@12ABUQTileRules@@V?$QFlags@W4DrawingHint@QDrawBorderPixmap@@@@@Z @ 7390 NONAME ; void qDrawBorderPixmap(class QPainter *, class QRect const &, class QMargins const &, class QPixmap const &, class QRect const &, class QMargins const &, struct QTileRules const &, class QFlags<enum QDrawBorderPixmap::DrawingHint>)
-	?qDrawPixmaps@@YAXPAVQPainter@@PBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 7391 NONAME ; void qDrawPixmaps(class QPainter *, struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
+	?qDrawPixmaps@@YAXPAVQPainter@@PBUData@QDrawPixmaps@@HABVQPixmap@@V?$QFlags@W4DrawingHint@QDrawPixmaps@@@@@Z @ 7391 NONAME ABSENT ; void qDrawPixmaps(class QPainter *, struct QDrawPixmaps::Data const *, int, class QPixmap const &, class QFlags<enum QDrawPixmaps::DrawingHint>)
 	?qDrawPlainRect@@YAXPAVQPainter@@ABVQRect@@ABVQColor@@HPBVQBrush@@@Z @ 7392 NONAME ; void qDrawPlainRect(class QPainter *, class QRect const &, class QColor const &, int, class QBrush const *)
 	?qDrawPlainRect@@YAXPAVQPainter@@HHHHABVQColor@@HPBVQBrush@@@Z @ 7393 NONAME ; void qDrawPlainRect(class QPainter *, int, int, int, int, class QColor const &, int, class QBrush const *)
 	?qDrawShadeLine@@YAXPAVQPainter@@ABVQPoint@@1ABVQPalette@@_NHH@Z @ 7394 NONAME ; void qDrawShadeLine(class QPainter *, class QPoint const &, class QPoint const &, class QPalette const &, bool, int, int)
@@ -11922,7 +11922,7 @@ EXPORTS
 	?updateCachedClipPathFromSetPosHelper@QGraphicsItemPrivate@@QAEXABVQPointF@@@Z @ 11921 NONAME ABSENT ; void QGraphicsItemPrivate::updateCachedClipPathFromSetPosHelper(class QPointF const &)
 	?updateCell@QCalendarWidget@@IAEXABVQDate@@@Z @ 11922 NONAME ; void QCalendarWidget::updateCell(class QDate const &)
 	?updateCells@QCalendarWidget@@IAEXXZ @ 11923 NONAME ; void QCalendarWidget::updateCells(void)
-	?updateDisplayText@QLineControl@@AAEXXZ @ 11924 NONAME ; void QLineControl::updateDisplayText(void)
+	?updateDisplayText@QLineControl@@AAEXXZ @ 11924 NONAME ABSENT ; void QLineControl::updateDisplayText(void)
 	?updateEditorData@QAbstractItemView@@MAEXXZ @ 11925 NONAME ; void QAbstractItemView::updateEditorData(void)
 	?updateEditorGeometries@QAbstractItemView@@MAEXXZ @ 11926 NONAME ; void QAbstractItemView::updateEditorGeometries(void)
 	?updateEditorGeometry@QAbstractItemDelegate@@UBEXPAVQWidget@@ABVQStyleOptionViewItem@@ABVQModelIndex@@@Z @ 11927 NONAME ; void QAbstractItemDelegate::updateEditorGeometry(class QWidget *, class QStyleOptionViewItem const &, class QModelIndex const &) const
@@ -12601,13 +12601,13 @@ EXPORTS
 	?setPixelFormat@QEglProperties@@QAEXW4Format@QImage@@@Z @ 12600 NONAME ABSENT ; void QEglProperties::setPixelFormat(enum QImage::Format)
 	?currentContext@QEglContext@@CAPAV1@W4API@QEgl@@@Z @ 12601 NONAME ABSENT ; class QEglContext * QEglContext::currentContext(enum QEgl::API)
 	?errorString@QEglContext@@SA?AVQString@@H@Z @ 12602 NONAME ABSENT ; class QString QEglContext::errorString(int)
-	?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @12603 ; NONAME ; bool QFontDatabase::removeAllApplicationFonts()
+	?removeAllApplicationFonts@QFontDatabase@@SA_NXZ @ 12603 NONAME ; NONAME ; bool QFontDatabase::removeAllApplicationFonts()
 	??0FileInfo@QZipReader@@QAE@XZ @ 12604 NONAME ; QZipReader::FileInfo::FileInfo(void)
 	??0QAbstractScrollAreaPrivate@@QAE@XZ @ 12605 NONAME ; QAbstractScrollAreaPrivate::QAbstractScrollAreaPrivate(void)
 	??0QGraphicsViewPrivate@@QAE@XZ @ 12606 NONAME ; QGraphicsViewPrivate::QGraphicsViewPrivate(void)
 	??0QKeySequence@@QAE@ABVQString@@W4SequenceFormat@0@@Z @ 12607 NONAME ; QKeySequence::QKeySequence(class QString const &, enum QKeySequence::SequenceFormat)
 	??0QStaticText@@QAE@ABV0@@Z @ 12608 NONAME ; QStaticText::QStaticText(class QStaticText const &)
-	??0QStaticText@@QAE@ABVQString@@ABVQSizeF@@@Z @ 12609 NONAME ; QStaticText::QStaticText(class QString const &, class QSizeF const &)
+	??0QStaticText@@QAE@ABVQString@@ABVQSizeF@@@Z @ 12609 NONAME ABSENT ; QStaticText::QStaticText(class QString const &, class QSizeF const &)
 	??0QStaticText@@QAE@XZ @ 12610 NONAME ; QStaticText::QStaticText(void)
 	??0QStaticTextItem@@QAE@XZ @ 12611 NONAME ; QStaticTextItem::QStaticTextItem(void)
 	??0QZipReader@@QAE@ABVQString@@V?$QFlags@W4OpenModeFlag@QIODevice@@@@@Z @ 12612 NONAME ; QZipReader::QZipReader(class QString const &, class QFlags<enum QIODevice::OpenModeFlag>)
@@ -12642,12 +12642,12 @@ EXPORTS
 	?contentsOffset@QAbstractScrollAreaPrivate@@UBE?AVQPoint@@XZ @ 12641 NONAME ; class QPoint QAbstractScrollAreaPrivate::contentsOffset(void) const
 	?convertFromImage@QPixmap@@QAE_NABVQImage@@V?$QFlags@W4ImageConversionFlag@Qt@@@@@Z @ 12642 NONAME ; bool QPixmap::convertFromImage(class QImage const &, class QFlags<enum Qt::ImageConversionFlag>)
 	?count@QZipReader@@QBEHXZ @ 12643 NONAME ; int QZipReader::count(void) const
-	?create@Fragment@QPainter@@SA?AV12@ABVQPointF@@ABVQRectF@@MMMM@Z @ 12644 NONAME ; class QPainter::Fragment QPainter::Fragment::create(class QPointF const &, class QRectF const &, float, float, float, float)
+	?create@Fragment@QPainter@@SA?AV12@ABVQPointF@@ABVQRectF@@MMMM@Z @ 12644 NONAME ABSENT ; class QPainter::Fragment QPainter::Fragment::create(class QPointF const &, class QRectF const &, float, float, float, float)
 	?detach@QStaticText@@AAEXXZ @ 12645 NONAME ; void QStaticText::detach(void)
 	?directoryLoaded@QFileSystemModel@@IAEXABVQString@@@Z @ 12646 NONAME ; void QFileSystemModel::directoryLoaded(class QString const &)
 	?dispatchPendingUpdateRequests@QGraphicsViewPrivate@@QAEXXZ @ 12647 NONAME ; void QGraphicsViewPrivate::dispatchPendingUpdateRequests(void)
-	?drawPixmapFragments@QPaintEngineEx@@UAEXPBVFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4FragmentHint@QPainter@@@@@Z @ 12648 NONAME ; void QPaintEngineEx::drawPixmapFragments(class QPainter::Fragment const *, int, class QPixmap const &, class QFlags<enum QPainter::FragmentHint>)
-	?drawPixmapFragments@QPainter@@QAEXPBVFragment@1@HABVQPixmap@@V?$QFlags@W4FragmentHint@QPainter@@@@@Z @ 12649 NONAME ; void QPainter::drawPixmapFragments(class QPainter::Fragment const *, int, class QPixmap const &, class QFlags<enum QPainter::FragmentHint>)
+	?drawPixmapFragments@QPaintEngineEx@@UAEXPBVFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4FragmentHint@QPainter@@@@@Z @ 12648 NONAME ABSENT ; void QPaintEngineEx::drawPixmapFragments(class QPainter::Fragment const *, int, class QPixmap const &, class QFlags<enum QPainter::FragmentHint>)
+	?drawPixmapFragments@QPainter@@QAEXPBVFragment@1@HABVQPixmap@@V?$QFlags@W4FragmentHint@QPainter@@@@@Z @ 12649 NONAME ABSENT ; void QPainter::drawPixmapFragments(class QPainter::Fragment const *, int, class QPixmap const &, class QFlags<enum QPainter::FragmentHint>)
 	?drawStaticText@QPainter@@QAEXABVQPoint@@ABVQStaticText@@@Z @ 12650 NONAME ; void QPainter::drawStaticText(class QPoint const &, class QStaticText const &)
 	?drawStaticText@QPainter@@QAEXABVQPointF@@ABVQStaticText@@@Z @ 12651 NONAME ; void QPainter::drawStaticText(class QPointF const &, class QStaticText const &)
 	?drawStaticText@QPainter@@QAEXHHABVQStaticText@@@Z @ 12652 NONAME ; void QPainter::drawStaticText(int, int, class QStaticText const &)
@@ -12677,7 +12677,7 @@ EXPORTS
 	?mapToScene@QGraphicsViewPrivate@@QBE?AVQRectF@@ABV2@@Z @ 12676 NONAME ; class QRectF QGraphicsViewPrivate::mapToScene(class QRectF const &) const
 	?mapToViewRect@QGraphicsViewPrivate@@QBE?AVQRect@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12677 NONAME ; class QRect QGraphicsViewPrivate::mapToViewRect(class QGraphicsItem const *, class QRectF const &) const
 	?mapToViewRegion@QGraphicsViewPrivate@@QBE?AVQRegion@@PBVQGraphicsItem@@ABVQRectF@@@Z @ 12678 NONAME ; class QRegion QGraphicsViewPrivate::mapToViewRegion(class QGraphicsItem const *, class QRectF const &) const
-	?maximumSize@QStaticText@@QBE?AVQSizeF@@XZ @ 12679 NONAME ; class QSizeF QStaticText::maximumSize(void) const
+	?maximumSize@QStaticText@@QBE?AVQSizeF@@XZ @ 12679 NONAME ABSENT ; class QSizeF QStaticText::maximumSize(void) const
 	?mouseMoveEventHandler@QGraphicsViewPrivate@@QAEXPAVQMouseEvent@@@Z @ 12680 NONAME ; void QGraphicsViewPrivate::mouseMoveEventHandler(class QMouseEvent *)
 	?performanceHint@QStaticText@@QBE?AW4PerformanceHint@1@XZ @ 12681 NONAME ; enum QStaticText::PerformanceHint QStaticText::performanceHint(void) const
 	?populate@QTextureGlyphCache@@QAEXPAVQFontEngine@@HPBIPBUQFixedPoint@@@Z @ 12682 NONAME ; void QTextureGlyphCache::populate(class QFontEngine *, int, unsigned int const *, struct QFixedPoint const *)
@@ -12700,7 +12700,7 @@ EXPORTS
 	?selectionStart@QLabel@@QBEHXZ @ 12699 NONAME ; int QLabel::selectionStart(void) const
 	?setAutoFillBackground@QGraphicsWidget@@QAEX_N@Z @ 12700 NONAME ; void QGraphicsWidget::setAutoFillBackground(bool)
 	?setColorFromString@QColor@@AAE_NABVQString@@@Z @ 12701 NONAME ; bool QColor::setColorFromString(class QString const &)
-	?setMaximumSize@QStaticText@@QAEXABVQSizeF@@@Z @ 12702 NONAME ; void QStaticText::setMaximumSize(class QSizeF const &)
+	?setMaximumSize@QStaticText@@QAEXABVQSizeF@@@Z @ 12702 NONAME ABSENT ; void QStaticText::setMaximumSize(class QSizeF const &)
 	?setPerformanceHint@QStaticText@@QAEXW4PerformanceHint@1@@Z @ 12703 NONAME ; void QStaticText::setPerformanceHint(enum QStaticText::PerformanceHint)
 	?setSelection@QLabel@@QAEXHH@Z @ 12704 NONAME ; void QLabel::setSelection(int, int)
 	?setText@QStaticText@@QAEXABVQString@@@Z @ 12705 NONAME ; void QStaticText::setText(class QString const &)
@@ -12723,4 +12723,48 @@ EXPORTS
 	?viewportEvent@QAbstractScrollAreaPrivate@@QAE_NPAVQEvent@@@Z @ 12722 NONAME ; bool QAbstractScrollAreaPrivate::viewportEvent(class QEvent *)
 	?visibilityChanged@QToolBar@@IAEX_N@Z @ 12723 NONAME ; void QToolBar::visibilityChanged(bool)
 	??0FileInfo@QZipReader@@QAE@ABU01@@Z @ 12724 NONAME ; QZipReader::FileInfo::FileInfo(struct QZipReader::FileInfo const &)
+	??0QStaticText@@QAE@ABVQString@@@Z @ 12725 NONAME ; QStaticText::QStaticText(class QString const &)
+	?append@QGraphicsItemPrivate@@SAXPAV?$QDeclarativeListProperty@VQGraphicsObject@@@@PAVQGraphicsObject@@@Z @ 12726 NONAME ; void QGraphicsItemPrivate::append(class QDeclarativeListProperty<class QGraphicsObject> *, class QGraphicsObject *)
+	?bitPlaneCount@QImage@@QBEHXZ @ 12727 NONAME ; int QImage::bitPlaneCount(void) const
+	?childrenChanged@QGraphicsObject@@IAEXXZ @ 12728 NONAME ; void QGraphicsObject::childrenChanged(void)
+	?childrenList@QGraphicsItemPrivate@@QAE?AV?$QDeclarativeListProperty@VQGraphicsObject@@@@XZ @ 12729 NONAME ; class QDeclarativeListProperty<class QGraphicsObject> QGraphicsItemPrivate::childrenList(void)
+	?clearFocusHelper@QGraphicsItemPrivate@@QAEX_N@Z @ 12730 NONAME ; void QGraphicsItemPrivate::clearFocusHelper(bool)
+	?commandDescription@QPaintBuffer@@QBE?AVQString@@H@Z @ 12731 NONAME ; class QString QPaintBuffer::commandDescription(int) const
+	?create@PixmapFragment@QPainter@@SA?AV12@ABVQPointF@@ABVQRectF@@MMMM@Z @ 12732 NONAME ; class QPainter::PixmapFragment QPainter::PixmapFragment::create(class QPointF const &, class QRectF const &, float, float, float, float)
+	?device@QZipReader@@QBEPAVQIODevice@@XZ @ 12733 NONAME ; class QIODevice * QZipReader::device(void) const
+	?drawPixmapFragments@QPaintEngineEx@@UAEXPBVPixmapFragment@QPainter@@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12734 NONAME ; void QPaintEngineEx::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags<enum QPainter::PixmapFragmentHint>)
+	?drawPixmapFragments@QPainter@@QAEXPBVPixmapFragment@1@HABVQPixmap@@V?$QFlags@W4PixmapFragmentHint@QPainter@@@@@Z @ 12735 NONAME ; void QPainter::drawPixmapFragments(class QPainter::PixmapFragment const *, int, class QPixmap const &, class QFlags<enum QPainter::PixmapFragmentHint>)
+	?frameEndIndex@QPaintBuffer@@QBEHH@Z @ 12736 NONAME ; int QPaintBuffer::frameEndIndex(int) const
+	?frameStartIndex@QPaintBuffer@@QBEHH@Z @ 12737 NONAME ; int QPaintBuffer::frameStartIndex(int) const
+	?geometryChanged@QGraphicsWidget@@IAEXXZ @ 12738 NONAME ; void QGraphicsWidget::geometryChanged(void)
+	?getGlyphBearings@QFontEngine@@UAEXIPAM0@Z @ 12739 NONAME ; void QFontEngine::getGlyphBearings(unsigned int, float *, float *)
+	?height@QGraphicsItemPrivate@@UBEMXZ @ 12740 NONAME ; float QGraphicsItemPrivate::height(void) const
+	?heightChanged@QGraphicsObject@@IAEXXZ @ 12741 NONAME ; void QGraphicsObject::heightChanged(void)
+	?horizontalAdvance@QTextLine@@QBEMXZ @ 12742 NONAME ; float QTextLine::horizontalAdvance(void) const
+	?isValid@FileInfo@QZipReader@@QBE_NXZ @ 12743 NONAME ; bool QZipReader::FileInfo::isValid(void) const
+	?layoutChanged@QGraphicsWidget@@IAEXXZ @ 12744 NONAME ; void QGraphicsWidget::layoutChanged(void)
+	?pageAdded@QWizard@@IAEXH@Z @ 12745 NONAME ; void QWizard::pageAdded(int)
+	?pageRemoved@QWizard@@IAEXH@Z @ 12746 NONAME ; void QWizard::pageRemoved(int)
+	?paste@QLineControl@@QAEXW4Mode@QClipboard@@@Z @ 12747 NONAME ; void QLineControl::paste(enum QClipboard::Mode)
+	?paste@QTextControl@@QAEXW4Mode@QClipboard@@@Z @ 12748 NONAME ; void QTextControl::paste(enum QClipboard::Mode)
+	?placeholderText@QLineEdit@@QBE?AVQString@@XZ @ 12749 NONAME ; class QString QLineEdit::placeholderText(void) const
+	?prependGraphicsTransform@QGraphicsItemPrivate@@QAEXPAVQGraphicsTransform@@@Z @ 12750 NONAME ; void QGraphicsItemPrivate::prependGraphicsTransform(class QGraphicsTransform *)
+	?processCommands@QPaintBuffer@@QBEHPAVQPainter@@HH@Z @ 12751 NONAME ; int QPaintBuffer::processCommands(class QPainter *, int, int) const
+	?processCommands@QPainterReplayer@@QAEXABVQPaintBuffer@@PAVQPainter@@HH@Z @ 12752 NONAME ; void QPainterReplayer::processCommands(class QPaintBuffer const &, class QPainter *, int, int)
+	?resetHeight@QGraphicsItemPrivate@@UAEXXZ @ 12753 NONAME ; void QGraphicsItemPrivate::resetHeight(void)
+	?resetWidth@QGraphicsItemPrivate@@UAEXXZ @ 12754 NONAME ; void QGraphicsItemPrivate::resetWidth(void)
+	?resizeEvent@QSplitterHandle@@MAEXPAVQResizeEvent@@@Z @ 12755 NONAME ; void QSplitterHandle::resizeEvent(class QResizeEvent *)
+	?setFocusHelper@QGraphicsItemPrivate@@QAEXW4FocusReason@Qt@@_N1@Z @ 12756 NONAME ; void QGraphicsItemPrivate::setFocusHelper(enum Qt::FocusReason, bool, bool)
+	?setHeight@QGraphicsItemPrivate@@UAEXM@Z @ 12757 NONAME ; void QGraphicsItemPrivate::setHeight(float)
+	?setPlaceholderText@QLineEdit@@QAEXABVQString@@@Z @ 12758 NONAME ; void QLineEdit::setPlaceholderText(class QString const &)
+	?setSideWidget@QWizard@@QAEXPAVQWidget@@@Z @ 12759 NONAME ; void QWizard::setSideWidget(class QWidget *)
+	?setTextWidth@QStaticText@@QAEXM@Z @ 12760 NONAME ; void QStaticText::setTextWidth(float)
+	?setWidth@QGraphicsItemPrivate@@UAEXM@Z @ 12761 NONAME ; void QGraphicsItemPrivate::setWidth(float)
+	?sideWidget@QWizard@@QBEPAVQWidget@@XZ @ 12762 NONAME ; class QWidget * QWizard::sideWidget(void) const
+	?textWidth@QStaticText@@QBEMXZ @ 12763 NONAME ; float QStaticText::textWidth(void) const
+	?updateDisplayText@QLineControl@@AAEX_N@Z @ 12764 NONAME ; void QLineControl::updateDisplayText(bool)
+	?updateMicroFocus@QGraphicsItem@@IAEXXZ @ 12765 NONAME ; void QGraphicsItem::updateMicroFocus(void)
+	?updateMicroFocus@QGraphicsObject@@IAEXXZ @ 12766 NONAME ; void QGraphicsObject::updateMicroFocus(void)
+	?width@QGraphicsItemPrivate@@UBEMXZ @ 12767 NONAME ; float QGraphicsItemPrivate::width(void) const
+	?widthChanged@QGraphicsObject@@IAEXXZ @ 12768 NONAME ; void QGraphicsObject::widthChanged(void)
 
diff --git a/src/s60installs/bwins/QtMultimediau.def b/src/s60installs/bwins/QtMultimediau.def
index 629db33..6c98fdf 100644
--- a/src/s60installs/bwins/QtMultimediau.def
+++ b/src/s60installs/bwins/QtMultimediau.def
@@ -405,7 +405,7 @@ EXPORTS
 	?addPropertyWatch@QMediaObject@@IAEXABVQByteArray@@@Z @ 404 NONAME ; void QMediaObject::addPropertyWatch(class QByteArray const &)
 	?addTimeRange@QMediaTimeRange@@QAEXABV1@@Z @ 405 NONAME ; void QMediaTimeRange::addTimeRange(class QMediaTimeRange const &)
 	?aspectRatioMode@QGraphicsVideoItem@@QBE?AW4AspectRatioMode@Qt@@XZ @ 406 NONAME ; enum Qt::AspectRatioMode QGraphicsVideoItem::aspectRatioMode(void) const
-	?aspectRatioMode@QVideoWidget@@QBE?AW4AspectRatioMode@1@XZ @ 407 NONAME ; enum QVideoWidget::AspectRatioMode QVideoWidget::aspectRatioMode(void) const
+	?aspectRatioMode@QVideoWidget@@QBE?AW4AspectRatioMode@1@XZ @ 407 NONAME ABSENT ; enum QVideoWidget::AspectRatioMode QVideoWidget::aspectRatioMode(void) const
 	?audioAvailableChanged@QMediaPlayer@@IAEX_N@Z @ 408 NONAME ; void QMediaPlayer::audioAvailableChanged(bool)
 	?audioAvailableChanged@QMediaPlayerControl@@IAEX_N@Z @ 409 NONAME ; void QMediaPlayerControl::audioAvailableChanged(bool)
 	?audioBitRate@QMediaResource@@QBEHXZ @ 410 NONAME ; int QMediaResource::audioBitRate(void) const
@@ -660,7 +660,7 @@ EXPORTS
 	?previousIndex@QMediaPlaylist@@QBEHH@Z @ 659 NONAME ; int QMediaPlaylist::previousIndex(int) const
 	?previousIndex@QMediaPlaylistNavigator@@QBEHH@Z @ 660 NONAME ; int QMediaPlaylistNavigator::previousIndex(int) const
 	?previousItem@QMediaPlaylistNavigator@@QBE?AVQMediaContent@@H@Z @ 661 NONAME ; class QMediaContent QMediaPlaylistNavigator::previousItem(int) const
-	?qRegisterDeclarativeElements@QtMultimedia@@YAXPBD@Z @ 662 NONAME ; void QtMultimedia::qRegisterDeclarativeElements(char const *)
+	?qRegisterDeclarativeElements@QtMultimedia@@YAXPBD@Z @ 662 NONAME ABSENT ; void QtMultimedia::qRegisterDeclarativeElements(char const *)
 	?qt_metacall@QGraphicsVideoItem@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 663 NONAME ; int QGraphicsVideoItem::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QLocalMediaPlaylistProvider@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 664 NONAME ; int QLocalMediaPlaylistProvider::qt_metacall(enum QMetaObject::Call, int, void * *)
 	?qt_metacall@QMediaControl@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 665 NONAME ; int QMediaControl::qt_metacall(enum QMetaObject::Call, int, void * *)
@@ -736,7 +736,7 @@ EXPORTS
 	?selectedDeviceChanged@QVideoDeviceControl@@IAEXH@Z @ 735 NONAME ; void QVideoDeviceControl::selectedDeviceChanged(int)
 	?service@QMediaObject@@UBEPAVQMediaService@@XZ @ 736 NONAME ; class QMediaService * QMediaObject::service(void) const
 	?setAspectRatioMode@QGraphicsVideoItem@@QAEXW4AspectRatioMode@Qt@@@Z @ 737 NONAME ; void QGraphicsVideoItem::setAspectRatioMode(enum Qt::AspectRatioMode)
-	?setAspectRatioMode@QVideoWidget@@QAEXW4AspectRatioMode@1@@Z @ 738 NONAME ; void QVideoWidget::setAspectRatioMode(enum QVideoWidget::AspectRatioMode)
+	?setAspectRatioMode@QVideoWidget@@QAEXW4AspectRatioMode@1@@Z @ 738 NONAME ABSENT ; void QVideoWidget::setAspectRatioMode(enum QVideoWidget::AspectRatioMode)
 	?setAudioBitRate@QMediaResource@@QAEXH@Z @ 739 NONAME ; void QMediaResource::setAudioBitRate(int)
 	?setAudioCodec@QMediaResource@@QAEXABVQString@@@Z @ 740 NONAME ; void QMediaResource::setAudioCodec(class QString const &)
 	?setBrightness@QPainterVideoSurface@@QAEXH@Z @ 741 NONAME ; void QPainterVideoSurface::setBrightness(int)
@@ -919,4 +919,31 @@ EXPORTS
 	?staticMetaObject@QPainterVideoSurface@@2UQMetaObject@@B @ 918 NONAME ; struct QMetaObject const QPainterVideoSurface::staticMetaObject
 	?staticMetaObject@QMediaPlaylistIOPlugin@@2UQMetaObject@@B @ 919 NONAME ; struct QMetaObject const QMediaPlaylistIOPlugin::staticMetaObject
 	?staticMetaObject@QGraphicsVideoItem@@2UQMetaObject@@B @ 920 NONAME ; struct QMetaObject const QGraphicsVideoItem::staticMetaObject
+	??0QSoundEffect@@QAE@PAVQObject@@@Z @ 921 NONAME ; QSoundEffect::QSoundEffect(class QObject *)
+	??1QSoundEffect@@UAE@XZ @ 922 NONAME ; QSoundEffect::~QSoundEffect(void)
+	??_EQSoundEffect@@UAE@I@Z @ 923 NONAME ; QSoundEffect::~QSoundEffect(unsigned int)
+	?aspectRatioMode@QVideoWidget@@QBE?AW4AspectRatioMode@Qt@@XZ @ 924 NONAME ; enum Qt::AspectRatioMode QVideoWidget::aspectRatioMode(void) const
+	?getStaticMetaObject@QSoundEffect@@SAABUQMetaObject@@XZ @ 925 NONAME ; struct QMetaObject const & QSoundEffect::getStaticMetaObject(void)
+	?isMuted@QSoundEffect@@QBE_NXZ @ 926 NONAME ; bool QSoundEffect::isMuted(void) const
+	?loops@QSoundEffect@@QBEHXZ @ 927 NONAME ; int QSoundEffect::loops(void) const
+	?loopsChanged@QSoundEffect@@IAEXXZ @ 928 NONAME ; void QSoundEffect::loopsChanged(void)
+	?metaObject@QSoundEffect@@UBEPBUQMetaObject@@XZ @ 929 NONAME ; struct QMetaObject const * QSoundEffect::metaObject(void) const
+	?mutedChanged@QSoundEffect@@IAEXXZ @ 930 NONAME ; void QSoundEffect::mutedChanged(void)
+	?play@QSoundEffect@@QAEXXZ @ 931 NONAME ; void QSoundEffect::play(void)
+	?qt_metacall@QSoundEffect@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 932 NONAME ; int QSoundEffect::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacast@QSoundEffect@@UAEPAXPBD@Z @ 933 NONAME ; void * QSoundEffect::qt_metacast(char const *)
+	?setAspectRatioMode@QVideoWidget@@QAEXW4AspectRatioMode@Qt@@@Z @ 934 NONAME ; void QVideoWidget::setAspectRatioMode(enum Qt::AspectRatioMode)
+	?setLoops@QSoundEffect@@QAEXH@Z @ 935 NONAME ; void QSoundEffect::setLoops(int)
+	?setMuted@QSoundEffect@@QAEX_N@Z @ 936 NONAME ; void QSoundEffect::setMuted(bool)
+	?setSource@QSoundEffect@@QAEXABVQUrl@@@Z @ 937 NONAME ; void QSoundEffect::setSource(class QUrl const &)
+	?setVolume@QSoundEffect@@QAEXH@Z @ 938 NONAME ; void QSoundEffect::setVolume(int)
+	?source@QSoundEffect@@QBE?AVQUrl@@XZ @ 939 NONAME ; class QUrl QSoundEffect::source(void) const
+	?sourceChanged@QSoundEffect@@IAEXXZ @ 940 NONAME ; void QSoundEffect::sourceChanged(void)
+	?tr@QSoundEffect@@SA?AVQString@@PBD0@Z @ 941 NONAME ; class QString QSoundEffect::tr(char const *, char const *)
+	?tr@QSoundEffect@@SA?AVQString@@PBD0H@Z @ 942 NONAME ; class QString QSoundEffect::tr(char const *, char const *, int)
+	?trUtf8@QSoundEffect@@SA?AVQString@@PBD0@Z @ 943 NONAME ; class QString QSoundEffect::trUtf8(char const *, char const *)
+	?trUtf8@QSoundEffect@@SA?AVQString@@PBD0H@Z @ 944 NONAME ; class QString QSoundEffect::trUtf8(char const *, char const *, int)
+	?volume@QSoundEffect@@QBEHXZ @ 945 NONAME ; int QSoundEffect::volume(void) const
+	?volumeChanged@QSoundEffect@@IAEXXZ @ 946 NONAME ; void QSoundEffect::volumeChanged(void)
+	?staticMetaObject@QSoundEffect@@2UQMetaObject@@B @ 947 NONAME ; struct QMetaObject const QSoundEffect::staticMetaObject
 
diff --git a/src/s60installs/bwins/QtNetworku.def b/src/s60installs/bwins/QtNetworku.def
index a24e0f5..b4db510 100644
--- a/src/s60installs/bwins/QtNetworku.def
+++ b/src/s60installs/bwins/QtNetworku.def
@@ -1046,9 +1046,9 @@ EXPORTS
 	?metaObject@QNetworkSessionPrivate@@UBEPBUQMetaObject@@XZ @ 1045 NONAME ; struct QMetaObject const * QNetworkSessionPrivate::metaObject(void) const
 	?migrate@QNetworkSession@@QAEXXZ @ 1046 NONAME ; void QNetworkSession::migrate(void)
 	?name@QNetworkConfiguration@@QBE?AVQString@@XZ @ 1047 NONAME ; class QString QNetworkConfiguration::name(void) const
-	?networkAccessChanged@QNetworkAccessManager@@IAEX_N@Z @ 1048 NONAME ; void QNetworkAccessManager::networkAccessChanged(bool)
-	?networkAccessEnabled@QNetworkAccessManager@@QBE_NXZ @ 1049 NONAME ; bool QNetworkAccessManager::networkAccessEnabled(void) const
-	?networkSessionOnline@QNetworkAccessManager@@IAEXXZ @ 1050 NONAME ; void QNetworkAccessManager::networkSessionOnline(void)
+	?networkAccessChanged@QNetworkAccessManager@@IAEX_N@Z @ 1048 NONAME ABSENT ; void QNetworkAccessManager::networkAccessChanged(bool)
+	?networkAccessEnabled@QNetworkAccessManager@@QBE_NXZ @ 1049 NONAME ABSENT ; bool QNetworkAccessManager::networkAccessEnabled(void) const
+	?networkSessionOnline@QNetworkAccessManager@@IAEXXZ @ 1050 NONAME ABSENT ; void QNetworkAccessManager::networkSessionOnline(void)
 	?newConfigurationActivated@QNetworkSession@@IAEXXZ @ 1051 NONAME ; void QNetworkSession::newConfigurationActivated(void)
 	?newConfigurationActivated@QNetworkSessionPrivate@@IAEXXZ @ 1052 NONAME ; void QNetworkSessionPrivate::newConfigurationActivated(void)
 	?onlineStateChanged@QNetworkConfigurationManager@@IAEX_N@Z @ 1053 NONAME ; void QNetworkConfigurationManager::onlineStateChanged(bool)
@@ -1081,7 +1081,7 @@ EXPORTS
 	?sessionProperty@QNetworkSession@@QBE?AVQVariant@@ABVQString@@@Z @ 1080 NONAME ; class QVariant QNetworkSession::sessionProperty(class QString const &) const
 	?setALREnabled@QNetworkSessionPrivate@@UAEX_N@Z @ 1081 NONAME ; void QNetworkSessionPrivate::setALREnabled(bool)
 	?setConfiguration@QNetworkAccessManager@@QAEXABVQNetworkConfiguration@@@Z @ 1082 NONAME ; void QNetworkAccessManager::setConfiguration(class QNetworkConfiguration const &)
-	?setNetworkAccessEnabled@QNetworkAccessManager@@QAEX_N@Z @ 1083 NONAME ; void QNetworkAccessManager::setNetworkAccessEnabled(bool)
+	?setNetworkAccessEnabled@QNetworkAccessManager@@QAEX_N@Z @ 1083 NONAME ABSENT ; void QNetworkAccessManager::setNetworkAccessEnabled(bool)
 	?setPriority@QNetworkRequest@@QAEXW4Priority@1@@Z @ 1084 NONAME ; void QNetworkRequest::setPriority(enum QNetworkRequest::Priority)
 	?setPrivateConfiguration@QNetworkSessionPrivate@@IBEXAAVQNetworkConfiguration@@V?$QExplicitlySharedDataPointer@VQNetworkConfigurationPrivate@@@@@Z @ 1085 NONAME ; void QNetworkSessionPrivate::setPrivateConfiguration(class QNetworkConfiguration &, class QExplicitlySharedDataPointer<class QNetworkConfigurationPrivate>) const
 	?setSessionProperty@QNetworkSession@@QAEXABVQString@@ABVQVariant@@@Z @ 1086 NONAME ; void QNetworkSession::setSessionProperty(class QString const &, class QVariant const &)
@@ -1126,4 +1126,20 @@ EXPORTS
 	?staticMetaObject@QNetworkConfigurationManager@@2UQMetaObject@@B @ 1125 NONAME ; struct QMetaObject const QNetworkConfigurationManager::staticMetaObject
 	?staticMetaObject@QBearerEnginePlugin@@2UQMetaObject@@B @ 1126 NONAME ; struct QMetaObject const QBearerEnginePlugin::staticMetaObject
 	?staticMetaObject@QNetworkConfigurationManagerPrivate@@2UQMetaObject@@B @ 1127 NONAME ; struct QMetaObject const QNetworkConfigurationManagerPrivate::staticMetaObject
+	?allConfigurations@QNetworkConfigurationManagerPrivate@@QAE?AV?$QList@VQNetworkConfiguration@@@@V?$QFlags@W4StateFlag@QNetworkConfiguration@@@@@Z @ 1128 NONAME ; class QList<class QNetworkConfiguration> QNetworkConfigurationManagerPrivate::allConfigurations(class QFlags<enum QNetworkConfiguration::StateFlag>)
+	?configurationFromIdentifier@QNetworkConfigurationManagerPrivate@@QAE?AVQNetworkConfiguration@@ABVQString@@@Z @ 1129 NONAME ; class QNetworkConfiguration QNetworkConfigurationManagerPrivate::configurationFromIdentifier(class QString const &)
+	?configurationsInUse@QBearerEngine@@QBE_NXZ @ 1130 NONAME ; bool QBearerEngine::configurationsInUse(void) const
+	?defaultConfiguration@QNetworkConfigurationManagerPrivate@@QAE?AVQNetworkConfiguration@@XZ @ 1131 NONAME ; class QNetworkConfiguration QNetworkConfigurationManagerPrivate::defaultConfiguration(void)
+	?disablePolling@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1132 NONAME ; void QNetworkConfigurationManagerPrivate::disablePolling(void)
+	?enablePolling@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1133 NONAME ; void QNetworkConfigurationManagerPrivate::enablePolling(void)
+	?isOnline@QNetworkConfigurationManagerPrivate@@QAE_NXZ @ 1134 NONAME ; bool QNetworkConfigurationManagerPrivate::isOnline(void)
+	?networkAccessible@QNetworkAccessManager@@QBE?AW4NetworkAccessibility@1@XZ @ 1135 NONAME ; enum QNetworkAccessManager::NetworkAccessibility QNetworkAccessManager::networkAccessible(void) const
+	?networkAccessibleChanged@QNetworkAccessManager@@IAEXW4NetworkAccessibility@1@@Z @ 1136 NONAME ; void QNetworkAccessManager::networkAccessibleChanged(enum QNetworkAccessManager::NetworkAccessibility)
+	?networkSessionConnected@QNetworkAccessManager@@IAEXXZ @ 1137 NONAME ; void QNetworkAccessManager::networkSessionConnected(void)
+	?pollEngines@QNetworkConfigurationManagerPrivate@@AAEXXZ @ 1138 NONAME ; void QNetworkConfigurationManagerPrivate::pollEngines(void)
+	?qt_qhostinfo_clear_cache@@YAXXZ @ 1139 NONAME ; void qt_qhostinfo_clear_cache(void)
+	?qt_qhostinfo_lookup@@YA?AVQHostInfo@@ABVQString@@PAVQObject@@PBDPA_NPAH@Z @ 1140 NONAME ; class QHostInfo qt_qhostinfo_lookup(class QString const &, class QObject *, char const *, bool *, int *)
+	?requiresPolling@QBearerEngine@@UBE_NXZ @ 1141 NONAME ; bool QBearerEngine::requiresPolling(void) const
+	?setNetworkAccessible@QNetworkAccessManager@@QAEXW4NetworkAccessibility@1@@Z @ 1142 NONAME ; void QNetworkAccessManager::setNetworkAccessible(enum QNetworkAccessManager::NetworkAccessibility)
+	?startPolling@QNetworkConfigurationManagerPrivate@@QAEXXZ @ 1143 NONAME ; void QNetworkConfigurationManagerPrivate::startPolling(void)
 
diff --git a/src/s60installs/bwins/QtScriptu.def b/src/s60installs/bwins/QtScriptu.def
index dd467ed..7769443 100644
--- a/src/s60installs/bwins/QtScriptu.def
+++ b/src/s60installs/bwins/QtScriptu.def
@@ -1,5 +1,5 @@
 EXPORTS
-	??0PersistentIdentifier@QScriptDeclarativeClass@@AAE@_N@Z @ 1 NONAME ; QScriptDeclarativeClass::PersistentIdentifier::PersistentIdentifier(bool)
+	??0PersistentIdentifier@QScriptDeclarativeClass@@AAE@_N@Z @ 1 NONAME ABSENT ; QScriptDeclarativeClass::PersistentIdentifier::PersistentIdentifier(bool)
 	??0PersistentIdentifier@QScriptDeclarativeClass@@QAE@ABV01@@Z @ 2 NONAME ; QScriptDeclarativeClass::PersistentIdentifier::PersistentIdentifier(class QScriptDeclarativeClass::PersistentIdentifier const &)
 	??0PersistentIdentifier@QScriptDeclarativeClass@@QAE@XZ @ 3 NONAME ; QScriptDeclarativeClass::PersistentIdentifier::PersistentIdentifier(void)
 	??0QScriptClass@@IAE@PAVQScriptEngine@@AAVQScriptClassPrivate@@@Z @ 4 NONAME ; QScriptClass::QScriptClass(class QScriptEngine *, class QScriptClassPrivate &)
@@ -95,7 +95,7 @@ EXPORTS
 	?argumentCount@QScriptContext@@QBEHXZ @ 94 NONAME ; int QScriptContext::argumentCount(void) const
 	?argumentCount@QScriptable@@QBEHXZ @ 95 NONAME ; int QScriptable::argumentCount(void) const
 	?argumentsObject@QScriptContext@@QBE?AVQScriptValue@@XZ @ 96 NONAME ; class QScriptValue QScriptContext::argumentsObject(void) const
-	?atStatement@QScriptEngineAgentPrivate@@UAEXABVDebuggerCallFrame@QTJSC@@HHH@Z @ 97 NONAME ; void QScriptEngineAgentPrivate::atStatement(class QTJSC::DebuggerCallFrame const &, int, int, int)
+	?atStatement@QScriptEngineAgentPrivate@@UAEXABVDebuggerCallFrame@QTJSC@@HHH@Z @ 97 NONAME ABSENT ; void QScriptEngineAgentPrivate::atStatement(class QTJSC::DebuggerCallFrame const &, int, int, int)
 	?attach@QScriptEngineAgentPrivate@@QAEXXZ @ 98 NONAME ; void QScriptEngineAgentPrivate::attach(void)
 	?availableExtensions@QScriptEngine@@QBE?AVQStringList@@XZ @ 99 NONAME ; class QStringList QScriptEngine::availableExtensions(void) const
 	?backtrace@QScriptContext@@QBE?AVQStringList@@XZ @ 100 NONAME ; class QStringList QScriptContext::backtrace(void) const
@@ -148,7 +148,7 @@ EXPORTS
 	?defaultPrototype@QScriptEngine@@QBE?AVQScriptValue@@H@Z @ 147 NONAME ; class QScriptValue QScriptEngine::defaultPrototype(int) const
 	?detach@QScriptEngineAgentPrivate@@QAEXXZ @ 148 NONAME ; void QScriptEngineAgentPrivate::detach(void)
 	?didExecuteProgram@QScriptEngineAgentPrivate@@UAEXABVDebuggerCallFrame@QTJSC@@HH@Z @ 149 NONAME ; void QScriptEngineAgentPrivate::didExecuteProgram(class QTJSC::DebuggerCallFrame const &, int, int)
-	?didReachBreakpoint@QScriptEngineAgentPrivate@@UAEXABVDebuggerCallFrame@QTJSC@@HHH@Z @ 150 NONAME ; void QScriptEngineAgentPrivate::didReachBreakpoint(class QTJSC::DebuggerCallFrame const &, int, int, int)
+	?didReachBreakpoint@QScriptEngineAgentPrivate@@UAEXABVDebuggerCallFrame@QTJSC@@HHH@Z @ 150 NONAME ABSENT ; void QScriptEngineAgentPrivate::didReachBreakpoint(class QTJSC::DebuggerCallFrame const &, int, int, int)
 	?engine@QScriptClass@@QBEPAVQScriptEngine@@XZ @ 151 NONAME ; class QScriptEngine * QScriptClass::engine(void) const
 	?engine@QScriptContext@@QBEPAVQScriptEngine@@XZ @ 152 NONAME ; class QScriptEngine * QScriptContext::engine(void) const
 	?engine@QScriptDeclarativeClass@@QBEPAVQScriptEngine@@XZ @ 153 NONAME ; class QScriptEngine * QScriptDeclarativeClass::engine(void) const
@@ -163,7 +163,7 @@ EXPORTS
 	?evaluate@QScriptEngine@@QAE?AVQScriptValue@@ABVQString@@0H@Z @ 162 NONAME ; class QScriptValue QScriptEngine::evaluate(class QString const &, class QString const &, int)
 	?evaluateStart@QScriptEngineAgentPrivate@@UAEXH@Z @ 163 NONAME ; void QScriptEngineAgentPrivate::evaluateStart(int)
 	?evaluateStop@QScriptEngineAgentPrivate@@UAEXABVJSValue@QTJSC@@H@Z @ 164 NONAME ; void QScriptEngineAgentPrivate::evaluateStop(class QTJSC::JSValue const &, int)
-	?exception@QScriptEngineAgentPrivate@@UAEXABVDebuggerCallFrame@QTJSC@@HH@Z @ 165 NONAME ; void QScriptEngineAgentPrivate::exception(class QTJSC::DebuggerCallFrame const &, int, int)
+	?exception@QScriptEngineAgentPrivate@@UAEXABVDebuggerCallFrame@QTJSC@@HH@Z @ 165 NONAME ABSENT ; void QScriptEngineAgentPrivate::exception(class QTJSC::DebuggerCallFrame const &, int, int)
 	?exceptionCatch@QScriptEngineAgent@@UAEX_JABVQScriptValue@@@Z @ 166 NONAME ; void QScriptEngineAgent::exceptionCatch(long long, class QScriptValue const &)
 	?exceptionCatch@QScriptEngineAgentPrivate@@UAEXABVDebuggerCallFrame@QTJSC@@H@Z @ 167 NONAME ; void QScriptEngineAgentPrivate::exceptionCatch(class QTJSC::DebuggerCallFrame const &, int)
 	?exceptionThrow@QScriptEngineAgent@@UAEX_JABVQScriptValue@@_N@Z @ 168 NONAME ; void QScriptEngineAgent::exceptionThrow(long long, class QScriptValue const &, bool)
@@ -395,4 +395,10 @@ EXPORTS
 	?setSupportsCall@QScriptDeclarativeClass@@QAEX_N@Z @ 394 NONAME ; void QScriptDeclarativeClass::setSupportsCall(bool)
 	?supportsCall@QScriptDeclarativeClass@@QBE_NXZ @ 395 NONAME ; bool QScriptDeclarativeClass::supportsCall(void) const
 	?toScriptValue@Value@QScriptDeclarativeClass@@QBE?AVQScriptValue@@PAVQScriptEngine@@@Z @ 396 NONAME ; class QScriptValue QScriptDeclarativeClass::Value::toScriptValue(class QScriptEngine *) const
+	??0PersistentIdentifier@QScriptDeclarativeClass@@AAE@PAVQScriptEnginePrivate@@@Z @ 397 NONAME ; QScriptDeclarativeClass::PersistentIdentifier::PersistentIdentifier(class QScriptEnginePrivate *)
+	?atStatement@QScriptEngineAgentPrivate@@UAEXABVDebuggerCallFrame@QTJSC@@HH@Z @ 398 NONAME ; void QScriptEngineAgentPrivate::atStatement(class QTJSC::DebuggerCallFrame const &, int, int)
+	?compare@QScriptDeclarativeClass@@UAE_NPAUObject@1@0@Z @ 399 NONAME ; bool QScriptDeclarativeClass::compare(struct QScriptDeclarativeClass::Object *, struct QScriptDeclarativeClass::Object *)
+	?didReachBreakpoint@QScriptEngineAgentPrivate@@UAEXABVDebuggerCallFrame@QTJSC@@HH@Z @ 400 NONAME ; void QScriptEngineAgentPrivate::didReachBreakpoint(class QTJSC::DebuggerCallFrame const &, int, int)
+	?exception@QScriptEngineAgentPrivate@@UAEXABVDebuggerCallFrame@QTJSC@@HH_N@Z @ 401 NONAME ; void QScriptEngineAgentPrivate::exception(class QTJSC::DebuggerCallFrame const &, int, int, bool)
+	?reportAdditionalMemoryCost@QScriptEngine@@QAEXH@Z @ 402 NONAME ; void QScriptEngine::reportAdditionalMemoryCost(int)
 
diff --git a/src/s60installs/bwins/phononu.def b/src/s60installs/bwins/phononu.def
index fcb2c55..cc4c083 100644
--- a/src/s60installs/bwins/phononu.def
+++ b/src/s60installs/bwins/phononu.def
@@ -514,4 +514,60 @@ EXPORTS
 	?staticMetaObject@AudioOutput@Phonon@@2UQMetaObject@@B @ 513 NONAME ; struct QMetaObject const Phonon::AudioOutput::staticMetaObject
 	?staticMetaObject@VideoWidget@Phonon@@2UQMetaObject@@B @ 514 NONAME ; struct QMetaObject const Phonon::VideoWidget::staticMetaObject
 	?staticMetaObject@SeekSlider@Phonon@@2UQMetaObject@@B @ 515 NONAME ; struct QMetaObject const Phonon::SeekSlider::staticMetaObject
+	??0AudioDataOutput@Phonon@@QAE@PAVQObject@@@Z @ 516 NONAME ; Phonon::AudioDataOutput::AudioDataOutput(class QObject *)
+	??0PulseSupport@Phonon@@AAE@XZ @ 517 NONAME ; Phonon::PulseSupport::PulseSupport(void)
+	??1AudioDataOutput@Phonon@@UAE@XZ @ 518 NONAME ; Phonon::AudioDataOutput::~AudioDataOutput(void)
+	??1PulseSupport@Phonon@@EAE@XZ @ 519 NONAME ; Phonon::PulseSupport::~PulseSupport(void)
+	??_EAudioDataOutput@Phonon@@UAE@I@Z @ 520 NONAME ; Phonon::AudioDataOutput::~AudioDataOutput(unsigned int)
+	??_EPulseSupport@Phonon@@UAE@I@Z @ 521 NONAME ; Phonon::PulseSupport::~PulseSupport(unsigned int)
+	?clearStreamCache@PulseSupport@Phonon@@QAEXVQString@@@Z @ 522 NONAME ; void Phonon::PulseSupport::clearStreamCache(class QString)
+	?createAudioDataOutput@Factory@Phonon@@YAPAVQObject@@PAV3@@Z @ 523 NONAME ; class QObject * Phonon::Factory::createAudioDataOutput(class QObject *)
+	?dataReady@AudioDataOutput@Phonon@@IAEXABV?$QMap@W4Channel@AudioDataOutput@Phonon@@V?$QVector@F@@@@@Z @ 524 NONAME ; void Phonon::AudioDataOutput::dataReady(class QMap<enum Phonon::AudioDataOutput::Channel, class QVector<short> > const &)
+	?dataSize@AudioDataOutput@Phonon@@QBEHXZ @ 525 NONAME ; int Phonon::AudioDataOutput::dataSize(void) const
+	?emitObjectDescriptionChanged@PulseSupport@Phonon@@QAEXW4ObjectDescriptionType@2@@Z @ 526 NONAME ; void Phonon::PulseSupport::emitObjectDescriptionChanged(enum Phonon::ObjectDescriptionType)
+	?emitUsingDevice@PulseSupport@Phonon@@QAEXVQString@@H@Z @ 527 NONAME ; void Phonon::PulseSupport::emitUsingDevice(class QString, int)
+	?enable@PulseSupport@Phonon@@QAEX_N@Z @ 528 NONAME ; void Phonon::PulseSupport::enable(bool)
+	?endOfMedia@AudioDataOutput@Phonon@@IAEXH@Z @ 529 NONAME ; void Phonon::AudioDataOutput::endOfMedia(int)
+	?getInstance@PulseSupport@Phonon@@SAPAV12@XZ @ 530 NONAME ; class Phonon::PulseSupport * Phonon::PulseSupport::getInstance(void)
+	?getStaticMetaObject@AudioDataOutput@Phonon@@SAABUQMetaObject@@XZ @ 531 NONAME ; struct QMetaObject const & Phonon::AudioDataOutput::getStaticMetaObject(void)
+	?getStaticMetaObject@PulseSupport@Phonon@@SAABUQMetaObject@@XZ @ 532 NONAME ; struct QMetaObject const & Phonon::PulseSupport::getStaticMetaObject(void)
+	?hideAdvancedDevices@GlobalConfig@Phonon@@QBE_NXZ @ 533 NONAME ; bool Phonon::GlobalConfig::hideAdvancedDevices(void) const
+	?isActive@PulseSupport@Phonon@@QAE_NXZ @ 534 NONAME ; bool Phonon::PulseSupport::isActive(void)
+	?k_func@AudioDataOutput@Phonon@@AAEPAVAudioDataOutputPrivate@2@XZ @ 535 NONAME ; class Phonon::AudioDataOutputPrivate * Phonon::AudioDataOutput::k_func(void)
+	?k_func@AudioDataOutput@Phonon@@ABEPBVAudioDataOutputPrivate@2@XZ @ 536 NONAME ; class Phonon::AudioDataOutputPrivate const * Phonon::AudioDataOutput::k_func(void) const
+	?k_func@GlobalConfig@Phonon@@AAEPAVGlobalConfigPrivate@2@XZ @ 537 NONAME ; class Phonon::GlobalConfigPrivate * Phonon::GlobalConfig::k_func(void)
+	?k_func@GlobalConfig@Phonon@@ABEPBVGlobalConfigPrivate@2@XZ @ 538 NONAME ; class Phonon::GlobalConfigPrivate const * Phonon::GlobalConfig::k_func(void) const
+	?metaObject@AudioDataOutput@Phonon@@UBEPBUQMetaObject@@XZ @ 539 NONAME ; struct QMetaObject const * Phonon::AudioDataOutput::metaObject(void) const
+	?metaObject@PulseSupport@Phonon@@UBEPBUQMetaObject@@XZ @ 540 NONAME ; struct QMetaObject const * Phonon::PulseSupport::metaObject(void) const
+	?objectDescriptionChanged@PulseSupport@Phonon@@IAEXW4ObjectDescriptionType@2@@Z @ 541 NONAME ; void Phonon::PulseSupport::objectDescriptionChanged(enum Phonon::ObjectDescriptionType)
+	?objectDescriptionIndexes@PulseSupport@Phonon@@QBE?AV?$QList@H@@W4ObjectDescriptionType@2@@Z @ 542 NONAME ; class QList<int> Phonon::PulseSupport::objectDescriptionIndexes(enum Phonon::ObjectDescriptionType) const
+	?objectDescriptionProperties@PulseSupport@Phonon@@QBE?AV?$QHash@VQByteArray@@VQVariant@@@@W4ObjectDescriptionType@2@H@Z @ 543 NONAME ; class QHash<class QByteArray, class QVariant> Phonon::PulseSupport::objectDescriptionProperties(enum Phonon::ObjectDescriptionType, int) const
+	?objectIndexesByCategory@PulseSupport@Phonon@@QBE?AV?$QList@H@@W4ObjectDescriptionType@2@W4Category@2@@Z @ 544 NONAME ; class QList<int> Phonon::PulseSupport::objectIndexesByCategory(enum Phonon::ObjectDescriptionType, enum Phonon::Category) const
+	?qt_metacall@AudioDataOutput@Phonon@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 545 NONAME ; int Phonon::AudioDataOutput::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacall@PulseSupport@Phonon@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 546 NONAME ; int Phonon::PulseSupport::qt_metacall(enum QMetaObject::Call, int, void * *)
+	?qt_metacast@AudioDataOutput@Phonon@@UAEPAXPBD@Z @ 547 NONAME ; void * Phonon::AudioDataOutput::qt_metacast(char const *)
+	?qt_metacast@PulseSupport@Phonon@@UAEPAXPBD@Z @ 548 NONAME ; void * Phonon::PulseSupport::qt_metacast(char const *)
+	?sampleRate@AudioDataOutput@Phonon@@QBEHXZ @ 549 NONAME ; int Phonon::AudioDataOutput::sampleRate(void) const
+	?setAudioCaptureDeviceListFor@GlobalConfig@Phonon@@QAEXW4Category@2@V?$QList@H@@@Z @ 550 NONAME ; void Phonon::GlobalConfig::setAudioCaptureDeviceListFor(enum Phonon::Category, class QList<int>)
+	?setAudioOutputDeviceListFor@GlobalConfig@Phonon@@QAEXW4Category@2@V?$QList@H@@@Z @ 551 NONAME ; void Phonon::GlobalConfig::setAudioOutputDeviceListFor(enum Phonon::Category, class QList<int>)
+	?setCaptureDevice@PulseSupport@Phonon@@QAE_NVQString@@H@Z @ 552 NONAME ; bool Phonon::PulseSupport::setCaptureDevice(class QString, int)
+	?setCaptureDevicePriorityForCategory@PulseSupport@Phonon@@QAEXW4Category@2@V?$QList@H@@@Z @ 553 NONAME ; void Phonon::PulseSupport::setCaptureDevicePriorityForCategory(enum Phonon::Category, class QList<int>)
+	?setDataSize@AudioDataOutput@Phonon@@QAEXH@Z @ 554 NONAME ; void Phonon::AudioDataOutput::setDataSize(int)
+	?setHideAdvancedDevices@GlobalConfig@Phonon@@QAEX_N@Z @ 555 NONAME ; void Phonon::GlobalConfig::setHideAdvancedDevices(bool)
+	?setOutputDevice@PulseSupport@Phonon@@QAE_NVQString@@H@Z @ 556 NONAME ; bool Phonon::PulseSupport::setOutputDevice(class QString, int)
+	?setOutputDevicePriorityForCategory@PulseSupport@Phonon@@QAEXW4Category@2@V?$QList@H@@@Z @ 557 NONAME ; void Phonon::PulseSupport::setOutputDevicePriorityForCategory(enum Phonon::Category, class QList<int>)
+	?setStreamPropList@PulseSupport@Phonon@@QAEXW4Category@2@VQString@@@Z @ 558 NONAME ; void Phonon::PulseSupport::setStreamPropList(enum Phonon::Category, class QString)
+	?shutdown@PulseSupport@Phonon@@SAXXZ @ 559 NONAME ; void Phonon::PulseSupport::shutdown(void)
+	?snapshot@VideoWidget@Phonon@@QBE?AVQImage@@XZ @ 560 NONAME ; class QImage Phonon::VideoWidget::snapshot(void) const
+	?tr@AudioDataOutput@Phonon@@SA?AVQString@@PBD0@Z @ 561 NONAME ; class QString Phonon::AudioDataOutput::tr(char const *, char const *)
+	?tr@AudioDataOutput@Phonon@@SA?AVQString@@PBD0H@Z @ 562 NONAME ; class QString Phonon::AudioDataOutput::tr(char const *, char const *, int)
+	?tr@PulseSupport@Phonon@@SA?AVQString@@PBD0@Z @ 563 NONAME ; class QString Phonon::PulseSupport::tr(char const *, char const *)
+	?tr@PulseSupport@Phonon@@SA?AVQString@@PBD0H@Z @ 564 NONAME ; class QString Phonon::PulseSupport::tr(char const *, char const *, int)
+	?trUtf8@AudioDataOutput@Phonon@@SA?AVQString@@PBD0@Z @ 565 NONAME ; class QString Phonon::AudioDataOutput::trUtf8(char const *, char const *)
+	?trUtf8@AudioDataOutput@Phonon@@SA?AVQString@@PBD0H@Z @ 566 NONAME ; class QString Phonon::AudioDataOutput::trUtf8(char const *, char const *, int)
+	?trUtf8@PulseSupport@Phonon@@SA?AVQString@@PBD0@Z @ 567 NONAME ; class QString Phonon::PulseSupport::trUtf8(char const *, char const *)
+	?trUtf8@PulseSupport@Phonon@@SA?AVQString@@PBD0H@Z @ 568 NONAME ; class QString Phonon::PulseSupport::trUtf8(char const *, char const *, int)
+	?usingDevice@PulseSupport@Phonon@@IAEXVQString@@H@Z @ 569 NONAME ; void Phonon::PulseSupport::usingDevice(class QString, int)
+	?staticMetaObject@PulseSupport@Phonon@@2UQMetaObject@@B @ 570 NONAME ; struct QMetaObject const Phonon::PulseSupport::staticMetaObject
+	?staticMetaObject@AudioDataOutput@Phonon@@2UQMetaObject@@B @ 571 NONAME ; struct QMetaObject const Phonon::AudioDataOutput::staticMetaObject
 
diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index b30d987..79fd0ce 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3670,7 +3670,7 @@ EXPORTS
 	_ZN8QVariantC1ERK12QEasingCurve @ 3669 NONAME
 	_ZN8QVariantC2ERK12QEasingCurve @ 3670 NONAME
 	_ZN9QDateTime18currentDateTimeUtcEv @ 3671 NONAME
-	_ZN9QDateTime22currentMsecsSinceEpochEv @ 3672 NONAME
+	_ZN9QDateTime22currentMSecsSinceEpochEv @ 3672 NONAME
 	_ZN9QListData11detach_growEPii @ 3673 NONAME
 	_ZN9QListData6appendEi @ 3674 NONAME
 	_ZN9QListData6detachEi @ 3675 NONAME
@@ -3689,4 +3689,7 @@ EXPORTS
 	_ZlsR11QDataStreamRK12QEasingCurve @ 3688 NONAME
 	_ZltRK13QElapsedTimerS1_ @ 3689 NONAME
 	_ZrsR11QDataStreamR12QEasingCurve @ 3690 NONAME
+	_ZN9QDateTime18setMSecsSinceEpochEx @ 3691 NONAME
+	_ZN9QDateTime19fromMSecsSinceEpochEx @ 3692 NONAME
+	_ZNK9QDateTime17toMSecsSinceEpochEv @ 3693 NONAME
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index c6d3d3f..17a57d0 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -14,7 +14,7 @@ EXPORTS
 	_ZN15QDeclarativePen8setWidthEi @ 13 NONAME
 	_ZN15QDeclarativeRow11qt_metacallEN11QMetaObject4CallEiPPv @ 14 NONAME
 	_ZN15QDeclarativeRow11qt_metacastEPKc @ 15 NONAME
-	_ZN15QDeclarativeRow13doPositioningEv @ 16 NONAME
+	_ZN15QDeclarativeRow13doPositioningEv @ 16 NONAME ABSENT
 	_ZN15QDeclarativeRow16staticMetaObjectE @ 17 NONAME DATA 16
 	_ZN15QDeclarativeRow19getStaticMetaObjectEv @ 18 NONAME
 	_ZN15QDeclarativeRowC1EP16QDeclarativeItem @ 19 NONAME
@@ -82,7 +82,7 @@ EXPORTS
 	_ZN16QDeclarativeFlow11flowChangedEv @ 81 NONAME
 	_ZN16QDeclarativeFlow11qt_metacallEN11QMetaObject4CallEiPPv @ 82 NONAME
 	_ZN16QDeclarativeFlow11qt_metacastEPKc @ 83 NONAME
-	_ZN16QDeclarativeFlow13doPositioningEv @ 84 NONAME
+	_ZN16QDeclarativeFlow13doPositioningEv @ 84 NONAME ABSENT
 	_ZN16QDeclarativeFlow16staticMetaObjectE @ 85 NONAME DATA 16
 	_ZN16QDeclarativeFlow19getStaticMetaObjectEv @ 86 NONAME
 	_ZN16QDeclarativeFlow7setFlowENS_4FlowE @ 87 NONAME
@@ -92,7 +92,7 @@ EXPORTS
 	_ZN16QDeclarativeGrid11qt_metacallEN11QMetaObject4CallEiPPv @ 91 NONAME
 	_ZN16QDeclarativeGrid11qt_metacastEPKc @ 92 NONAME
 	_ZN16QDeclarativeGrid11rowsChangedEv @ 93 NONAME
-	_ZN16QDeclarativeGrid13doPositioningEv @ 94 NONAME
+	_ZN16QDeclarativeGrid13doPositioningEv @ 94 NONAME ABSENT
 	_ZN16QDeclarativeGrid14columnsChangedEv @ 95 NONAME
 	_ZN16QDeclarativeGrid16staticMetaObjectE @ 96 NONAME DATA 16
 	_ZN16QDeclarativeGrid19getStaticMetaObjectEv @ 97 NONAME
@@ -327,7 +327,7 @@ EXPORTS
 	_ZN18QDeclarativeActionC2Ev @ 326 NONAME
 	_ZN18QDeclarativeColumn11qt_metacallEN11QMetaObject4CallEiPPv @ 327 NONAME
 	_ZN18QDeclarativeColumn11qt_metacastEPKc @ 328 NONAME
-	_ZN18QDeclarativeColumn13doPositioningEv @ 329 NONAME
+	_ZN18QDeclarativeColumn13doPositioningEv @ 329 NONAME ABSENT
 	_ZN18QDeclarativeColumn16staticMetaObjectE @ 330 NONAME DATA 16
 	_ZN18QDeclarativeColumn19getStaticMetaObjectEv @ 331 NONAME
 	_ZN18QDeclarativeColumnC1EP16QDeclarativeItem @ 332 NONAME
@@ -3369,4 +3369,29 @@ EXPORTS
 	_ZlsR11QDataStreamRKN29QDeclarativeEngineDebugServer26QDeclarativeObjectPropertyE @ 3368 NONAME
 	_ZrsR11QDataStreamRN29QDeclarativeEngineDebugServer22QDeclarativeObjectDataE @ 3369 NONAME
 	_ZrsR11QDataStreamRN29QDeclarativeEngineDebugServer26QDeclarativeObjectPropertyE @ 3370 NONAME
+	_ZN15QDeclarativeRow13doPositioningEP6QSizeF @ 3371 NONAME
+	_ZN16QDeclarativeFlow13doPositioningEP6QSizeF @ 3372 NONAME
+	_ZN16QDeclarativeGrid13doPositioningEP6QSizeF @ 3373 NONAME
+	_ZN18QDeclarativeColumn13doPositioningEP6QSizeF @ 3374 NONAME
+	_ZN18QDeclarativeParser7VariantC1ERK7QString @ 3375 NONAME
+	_ZN18QDeclarativeParser7VariantC1ERK7QStringPN14QDeclarativeJS3AST4NodeE @ 3376 NONAME
+	_ZN18QDeclarativeParser7VariantC1ERKS0_ @ 3377 NONAME
+	_ZN18QDeclarativeParser7VariantC1Eb @ 3378 NONAME
+	_ZN18QDeclarativeParser7VariantC1EdRK7QString @ 3379 NONAME
+	_ZN18QDeclarativeParser7VariantC1Ev @ 3380 NONAME
+	_ZN18QDeclarativeParser7VariantC2ERK7QString @ 3381 NONAME
+	_ZN18QDeclarativeParser7VariantC2ERK7QStringPN14QDeclarativeJS3AST4NodeE @ 3382 NONAME
+	_ZN18QDeclarativeParser7VariantC2ERKS0_ @ 3383 NONAME
+	_ZN18QDeclarativeParser7VariantC2Eb @ 3384 NONAME
+	_ZN18QDeclarativeParser7VariantC2EdRK7QString @ 3385 NONAME
+	_ZN18QDeclarativeParser7VariantC2Ev @ 3386 NONAME
+	_ZN18QDeclarativeParser7VariantaSERKS0_ @ 3387 NONAME
+	_ZNK18QDeclarativeParser7Variant12asStringListEv @ 3388 NONAME
+	_ZNK18QDeclarativeParser7Variant12isStringListEv @ 3389 NONAME
+	_ZNK18QDeclarativeParser7Variant4typeEv @ 3390 NONAME
+	_ZNK18QDeclarativeParser7Variant5asASTEv @ 3391 NONAME
+	_ZNK18QDeclarativeParser7Variant8asNumberEv @ 3392 NONAME
+	_ZNK18QDeclarativeParser7Variant8asScriptEv @ 3393 NONAME
+	_ZNK18QDeclarativeParser7Variant8asStringEv @ 3394 NONAME
+	_ZNK18QDeclarativeParser7Variant9asBooleanEv @ 3395 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 82c5128..59e63ea 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -1,7 +1,7 @@
 EXPORTS
 	_Z11qFadeEffectP7QWidgeti @ 1 NONAME
 	_Z11qt_image_idRK6QImage @ 2 NONAME
-	_Z12qDrawPixmapsP8QPainterPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS1_11DrawingHintEE @ 3 NONAME
+	_Z12qDrawPixmapsP8QPainterPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS1_11DrawingHintEE @ 3 NONAME ABSENT
 	_Z12qt_pixmap_idRK7QPixmap @ 4 NONAME
 	_Z13qDrawWinPanelP8QPainterRK5QRectRK8QPalettebPK6QBrush @ 5 NONAME
 	_Z13qDrawWinPanelP8QPainteriiiiRK8QPalettebPK6QBrush @ 6 NONAME
@@ -2906,7 +2906,7 @@ EXPORTS
 	_ZN14QPaintEngineEx10drawPointsEPK7QPointFi @ 2905 NONAME
 	_ZN14QPaintEngineEx11drawEllipseERK5QRect @ 2906 NONAME
 	_ZN14QPaintEngineEx11drawEllipseERK6QRectF @ 2907 NONAME
-	_ZN14QPaintEngineEx11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 2908 NONAME
+	_ZN14QPaintEngineEx11drawPixmapsEPKN12QDrawPixmaps4DataEiRK7QPixmap6QFlagsINS0_11DrawingHintEE @ 2908 NONAME ABSENT
 	_ZN14QPaintEngineEx11drawPolygonEPK6QPointiN12QPaintEngine15PolygonDrawModeE @ 2909 NONAME
 	_ZN14QPaintEngineEx11drawPolygonEPK7QPointFiN12QPaintEngine15PolygonDrawModeE @ 2910 NONAME
 	_ZN14QPaintEngineEx11updateStateERK17QPaintEngineState @ 2911 NONAME
@@ -3726,7 +3726,7 @@ EXPORTS
 	_ZN16QFileSystemModelD1Ev @ 3725 NONAME
 	_ZN16QFileSystemModelD2Ev @ 3726 NONAME
 	_ZN16QPainterReplayer14setupTransformEP8QPainter @ 3727 NONAME
-	_ZN16QPainterReplayer4drawERK12QPaintBufferP8QPainteri @ 3728 NONAME
+	_ZN16QPainterReplayer4drawERK12QPaintBufferP8QPainteri @ 3728 NONAME ABSENT
 	_ZN16QPainterReplayer7processERK19QPaintBufferCommand @ 3729 NONAME
 	_ZN16QRegExpValidator11qt_metacallEN11QMetaObject4CallEiPPv @ 3730 NONAME
 	_ZN16QRegExpValidator11qt_metacastEPKc @ 3731 NONAME
@@ -4223,7 +4223,7 @@ EXPORTS
 	_ZN18QTextBlockUserDataD0Ev @ 4222 NONAME
 	_ZN18QTextBlockUserDataD1Ev @ 4223 NONAME
 	_ZN18QTextBlockUserDataD2Ev @ 4224 NONAME
-	_ZN18QTextureGlyphCache8populateERK12QTextItemIntRK15QVarLengthArrayIjLi256EERKS3_I11QFixedPointLi256EE @ 4225 NONAME
+	_ZN18QTextureGlyphCache8populateERK12QTextItemIntRK15QVarLengthArrayIjLi256EERKS3_I11QFixedPointLi256EE @ 4225 NONAME ABSENT
 	_ZN19QAbstractProxyModel11qt_metacallEN11QMetaObject4CallEiPPv @ 4226 NONAME
 	_ZN19QAbstractProxyModel11qt_metacastEPKc @ 4227 NONAME
 	_ZN19QAbstractProxyModel13setHeaderDataEiN2Qt11OrientationERK8QVarianti @ 4228 NONAME
@@ -11821,15 +11821,15 @@ EXPORTS
 	_ZN10QZipReaderD1Ev @ 11820 NONAME
 	_ZN10QZipReaderD2Ev @ 11821 NONAME
 	_ZN11QStaticText13setTextFormatEN2Qt10TextFormatE @ 11822 NONAME
-	_ZN11QStaticText14setMaximumSizeERK6QSizeF @ 11823 NONAME
+	_ZN11QStaticText14setMaximumSizeERK6QSizeF @ 11823 NONAME ABSENT
 	_ZN11QStaticText18setPerformanceHintENS_15PerformanceHintE @ 11824 NONAME
 	_ZN11QStaticText6detachEv @ 11825 NONAME
 	_ZN11QStaticText7prepareERK10QTransformRK5QFont @ 11826 NONAME
 	_ZN11QStaticText7setTextERK7QString @ 11827 NONAME
-	_ZN11QStaticTextC1ERK7QStringRK6QSizeF @ 11828 NONAME
+	_ZN11QStaticTextC1ERK7QString @ 11828 NONAME
 	_ZN11QStaticTextC1ERKS_ @ 11829 NONAME
 	_ZN11QStaticTextC1Ev @ 11830 NONAME
-	_ZN11QStaticTextC2ERK7QStringRK6QSizeF @ 11831 NONAME
+	_ZN11QStaticTextC2ERK7QString @ 11831 NONAME
 	_ZN11QStaticTextC2ERKS_ @ 11832 NONAME
 	_ZN11QStaticTextC2Ev @ 11833 NONAME
 	_ZN11QStaticTextD1Ev @ 11834 NONAME
@@ -11894,7 +11894,7 @@ EXPORTS
 	_ZNK10QZipReader6statusEv @ 11893 NONAME
 	_ZNK10QZipReader8fileDataERK7QString @ 11894 NONAME
 	_ZNK11QStaticText10textFormatEv @ 11895 NONAME
-	_ZNK11QStaticText11maximumSizeEv @ 11896 NONAME
+	_ZNK11QStaticText11maximumSizeEv @ 11896 NONAME ABSENT
 	_ZNK11QStaticText15performanceHintEv @ 11897 NONAME
 	_ZNK11QStaticText4sizeEv @ 11898 NONAME
 	_ZNK11QStaticText4textEv @ 11899 NONAME
@@ -11960,4 +11960,14 @@ EXPORTS
 	_ZNK7QWizard10sideWidgetEv @ 11959 NONAME
 	_ZNK9QLineEdit15placeholderTextEv @ 11960 NONAME
 	_ZNK9QTextLine17horizontalAdvanceEv @ 11961 NONAME
+	_ZN11QStaticText12setTextWidthEf @ 11962 NONAME
+	_ZN13QGraphicsItem16updateMicroFocusEv @ 11963 NONAME
+	_ZN15QGraphicsObject16updateMicroFocusEv @ 11964 NONAME
+	_ZN15QGraphicsWidget13layoutChangedEv @ 11965 NONAME
+	_ZN16QPainterReplayer15processCommandsERK12QPaintBufferP8QPainterii @ 11966 NONAME
+	_ZNK11QStaticText9textWidthEv @ 11967 NONAME
+	_ZNK12QPaintBuffer13frameEndIndexEi @ 11968 NONAME
+	_ZNK12QPaintBuffer15frameStartIndexEi @ 11969 NONAME
+	_ZNK12QPaintBuffer15processCommandsEP8QPainterii @ 11970 NONAME
+	_ZNK12QPaintBuffer18commandDescriptionEi @ 11971 NONAME
 
diff --git a/src/s60installs/eabi/phononu.def b/src/s60installs/eabi/phononu.def
index af1e3cc..e80f225 100644
--- a/src/s60installs/eabi/phononu.def
+++ b/src/s60installs/eabi/phononu.def
@@ -544,4 +544,53 @@ EXPORTS
 	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE2EEE @ 543 NONAME
 	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE3EEE @ 544 NONAME
 	_ZTVN6Phonon22ObjectDescriptionModelILNS_21ObjectDescriptionTypeE4EEE @ 545 NONAME
+	_ZN6Phonon12GlobalConfig22setHideAdvancedDevicesEb @ 546 NONAME
+	_ZN6Phonon12GlobalConfig27setAudioOutputDeviceListForENS_8CategoryE5QListIiE @ 547 NONAME
+	_ZN6Phonon12GlobalConfig28setAudioCaptureDeviceListForENS_8CategoryE5QListIiE @ 548 NONAME
+	_ZN6Phonon12PulseSupport11getInstanceEv @ 549 NONAME
+	_ZN6Phonon12PulseSupport11qt_metacallEN11QMetaObject4CallEiPPv @ 550 NONAME
+	_ZN6Phonon12PulseSupport11qt_metacastEPKc @ 551 NONAME
+	_ZN6Phonon12PulseSupport11usingDeviceE7QStringi @ 552 NONAME
+	_ZN6Phonon12PulseSupport15emitUsingDeviceE7QStringi @ 553 NONAME
+	_ZN6Phonon12PulseSupport15setOutputDeviceE7QStringi @ 554 NONAME
+	_ZN6Phonon12PulseSupport16clearStreamCacheE7QString @ 555 NONAME
+	_ZN6Phonon12PulseSupport16setCaptureDeviceE7QStringi @ 556 NONAME
+	_ZN6Phonon12PulseSupport16staticMetaObjectE @ 557 NONAME DATA 16
+	_ZN6Phonon12PulseSupport17setStreamPropListENS_8CategoryE7QString @ 558 NONAME
+	_ZN6Phonon12PulseSupport19getStaticMetaObjectEv @ 559 NONAME
+	_ZN6Phonon12PulseSupport24objectDescriptionChangedENS_21ObjectDescriptionTypeE @ 560 NONAME
+	_ZN6Phonon12PulseSupport28emitObjectDescriptionChangedENS_21ObjectDescriptionTypeE @ 561 NONAME
+	_ZN6Phonon12PulseSupport34setOutputDevicePriorityForCategoryENS_8CategoryE5QListIiE @ 562 NONAME
+	_ZN6Phonon12PulseSupport35setCaptureDevicePriorityForCategoryENS_8CategoryE5QListIiE @ 563 NONAME
+	_ZN6Phonon12PulseSupport6enableEb @ 564 NONAME
+	_ZN6Phonon12PulseSupport8isActiveEv @ 565 NONAME
+	_ZN6Phonon12PulseSupport8shutdownEv @ 566 NONAME
+	_ZN6Phonon12PulseSupportC1Ev @ 567 NONAME
+	_ZN6Phonon12PulseSupportC2Ev @ 568 NONAME
+	_ZN6Phonon12PulseSupportD0Ev @ 569 NONAME
+	_ZN6Phonon12PulseSupportD1Ev @ 570 NONAME
+	_ZN6Phonon12PulseSupportD2Ev @ 571 NONAME
+	_ZN6Phonon15AudioDataOutput10endOfMediaEi @ 572 NONAME
+	_ZN6Phonon15AudioDataOutput11qt_metacallEN11QMetaObject4CallEiPPv @ 573 NONAME
+	_ZN6Phonon15AudioDataOutput11qt_metacastEPKc @ 574 NONAME
+	_ZN6Phonon15AudioDataOutput11setDataSizeEi @ 575 NONAME
+	_ZN6Phonon15AudioDataOutput16staticMetaObjectE @ 576 NONAME DATA 16
+	_ZN6Phonon15AudioDataOutput19getStaticMetaObjectEv @ 577 NONAME
+	_ZN6Phonon15AudioDataOutput9dataReadyERK4QMapINS0_7ChannelE7QVectorIsEE @ 578 NONAME
+	_ZN6Phonon15AudioDataOutputC1EP7QObject @ 579 NONAME
+	_ZN6Phonon15AudioDataOutputC2EP7QObject @ 580 NONAME
+	_ZN6Phonon7Factory21createAudioDataOutputEP7QObject @ 581 NONAME
+	_ZNK6Phonon11VideoWidget8snapshotEv @ 582 NONAME
+	_ZNK6Phonon12GlobalConfig19hideAdvancedDevicesEv @ 583 NONAME
+	_ZNK6Phonon12PulseSupport10metaObjectEv @ 584 NONAME
+	_ZNK6Phonon12PulseSupport23objectIndexesByCategoryENS_21ObjectDescriptionTypeENS_8CategoryE @ 585 NONAME
+	_ZNK6Phonon12PulseSupport24objectDescriptionIndexesENS_21ObjectDescriptionTypeE @ 586 NONAME
+	_ZNK6Phonon12PulseSupport27objectDescriptionPropertiesENS_21ObjectDescriptionTypeEi @ 587 NONAME
+	_ZNK6Phonon15AudioDataOutput10metaObjectEv @ 588 NONAME
+	_ZNK6Phonon15AudioDataOutput10sampleRateEv @ 589 NONAME
+	_ZNK6Phonon15AudioDataOutput8dataSizeEv @ 590 NONAME
+	_ZTIN6Phonon12PulseSupportE @ 591 NONAME
+	_ZTIN6Phonon15AudioDataOutputE @ 592 NONAME
+	_ZTVN6Phonon12PulseSupportE @ 593 NONAME
+	_ZTVN6Phonon15AudioDataOutputE @ 594 NONAME
 
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro
index ffd15e6..dfce7d2 100644
--- a/src/s60installs/s60installs.pro
+++ b/src/s60installs/s60installs.pro
@@ -16,9 +16,15 @@ symbian: {
         BLD_INF_RULES.prj_exports += \
             "sqlite3.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis" \
             "sqlite3_selfsigned.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3_selfsigned.sis"
-        sqlitedeployment = \
-            "; Deploy sqlite onto phone that does not have it already" \
-            "@\"$${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis\", (0x2002af5f)"
+        symbian-abld|symbian-sbsv2 {
+            sqlitedeployment = \
+                "; Deploy sqlite onto phone that does not have it already" \
+                "@\"$${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis\", (0x2002af5f)"
+        } else {
+            sqlitedeployment = \
+                "; Deploy sqlite onto phone that does not have it already" \
+                "@\"$${PWD}/sqlite3.sis\", (0x2002af5f)"
+        }
         qtlibraries.pkg_postrules += sqlitedeployment
     } else {
         # Always use experimental UID for infixed configuration to avoid UID clash
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp
index 13b8e7c..2417d80 100644
--- a/src/script/api/qscriptengine.cpp
+++ b/src/script/api/qscriptengine.cpp
@@ -1067,11 +1067,15 @@ void QScriptEnginePrivate::setGlobalObject(JSC::JSObject *object)
     if (object == globalObject())
         return;
     QScript::GlobalObject *glob = static_cast<QScript::GlobalObject*>(originalGlobalObject());
-    if (object == originalGlobalObjectProxy)
+    if (object == originalGlobalObjectProxy) {
         glob->customGlobalObject = 0;
-    else {
+        // Sync the internal prototype, since JSObject::prototype() is not virtual.
+        glob->setPrototype(originalGlobalObjectProxy->prototype());
+    } else {
         Q_ASSERT(object != originalGlobalObject());
         glob->customGlobalObject = object;
+        // Sync the internal prototype, since JSObject::prototype() is not virtual.
+        glob->setPrototype(object->prototype());
     }
 }
 
diff --git a/src/script/api/qscriptvalue.cpp b/src/script/api/qscriptvalue.cpp
index 7469f9a..1310c8c 100644
--- a/src/script/api/qscriptvalue.cpp
+++ b/src/script/api/qscriptvalue.cpp
@@ -538,19 +538,28 @@ void QScriptValue::setPrototype(const QScriptValue &prototype)
                  "a different engine");
         return;
     }
+    JSC::JSObject *thisObject = JSC::asObject(d->jscValue);
     JSC::JSValue other = d->engine->scriptValueToJSCValue(prototype);
 
     // check for cycle
     JSC::JSValue nextPrototypeValue = other;
     while (nextPrototypeValue && nextPrototypeValue.isObject()) {
         JSC::JSObject *nextPrototype = JSC::asObject(nextPrototypeValue);
-        if (nextPrototype == JSC::asObject(d->jscValue)) {
+        if (nextPrototype == thisObject) {
             qWarning("QScriptValue::setPrototype() failed: cyclic prototype value");
             return;
         }
         nextPrototypeValue = nextPrototype->prototype();
     }
-    JSC::asObject(d->jscValue)->setPrototype(other);
+
+    thisObject->setPrototype(other);
+
+    // Sync the internal Global Object prototype if appropriate.
+    if (((thisObject == d->engine->originalGlobalObjectProxy)
+         && !d->engine->customGlobalObject())
+        || (thisObject == d->engine->customGlobalObject())) {
+        d->engine->originalGlobalObject()->setPrototype(other);
+    }
 }
 
 /*!
diff --git a/tests/auto/qbrush/tst_qbrush.cpp b/tests/auto/qbrush/tst_qbrush.cpp
index 628e859..7e94f37 100644
--- a/tests/auto/qbrush/tst_qbrush.cpp
+++ b/tests/auto/qbrush/tst_qbrush.cpp
@@ -75,9 +75,10 @@ private slots:
     void gradientStops();
 
     void textures();
-    
+
     void nullBrush();
     void isOpaque();
+    void debug();
 };
 
 Q_DECLARE_METATYPE(QBrush)
@@ -399,5 +400,15 @@ void tst_QBrush::isOpaque()
     QVERIFY(!brush.isOpaque());
 }
 
+void tst_QBrush::debug()
+{
+    QPixmap pixmap_source(10, 10);
+    fill(&pixmap_source);
+    QBrush pixmap_brush;
+    pixmap_brush.setTexture(pixmap_source);
+    QCOMPARE(pixmap_brush.style(), Qt::TexturePattern);
+    qDebug() << pixmap_brush; // don't crash
+}
+
 QTEST_MAIN(tst_QBrush)
 #include "tst_qbrush.moc"
diff --git a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
index bf4ea5f..195f8b6 100644
--- a/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
+++ b/tests/auto/qdialogbuttonbox/tst_qdialogbuttonbox.cpp
@@ -721,11 +721,13 @@ void tst_QDialogButtonBox::testDefaultButton_data()
 static int softKeyCount(QWidget *widget)
 {
     int softkeyCount = 0;
+#ifndef QT_NO_ACTION
     QList<QAction *> actions = widget->actions();
     foreach (QAction *action, actions) {
         if (action->softKeyRole() != QAction::NoSoftKey)
             softkeyCount++;
     }
+#endif
     return softkeyCount;
 }
 
@@ -737,14 +739,18 @@ void tst_QDialogButtonBox::testS60SoftKeys()
     buttonBox.setStandardButtons(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
     dialog.show();
 
+#ifndef QT_NO_ACTION
     QCOMPARE( softKeyCount(&dialog), 2);
+#endif
 
     QDialog dialog2(0);
     QDialogButtonBox buttonBox2(&dialog2);
     buttonBox2.setStandardButtons(QDialogButtonBox::Cancel);
     dialog2.show();
 
+#ifndef QT_NO_ACTION
     QCOMPARE( softKeyCount(&dialog2), 1);
+#endif
 
 #else
     QSKIP("S60-specific test", SkipAll );
@@ -759,21 +765,27 @@ void tst_QDialogButtonBox::testSoftKeyReparenting()
     buttonBox->addButton(QDialogButtonBox::Ok);
     buttonBox->addButton(QDialogButtonBox::Cancel);
 
+#ifndef QT_NO_ACTION
     QCOMPARE(softKeyCount(&dialog), 0);
     QCOMPARE(softKeyCount(buttonBox), 2);
+#endif
 
     // Were the softkeys re-parented correctly?
     dialog.setLayout(new QVBoxLayout);
     dialog.layout()->addWidget(buttonBox);
+#ifndef QT_NO_ACTION
     QCOMPARE(softKeyCount(&dialog), 2);
     QCOMPARE(softKeyCount(buttonBox), 0);
+#endif
 
     // Softkeys are only added to QDialog, not QWidget
     QWidget *nested = new QWidget;
     nested->setLayout(new QVBoxLayout);
     nested->layout()->addWidget(buttonBox);
+#ifndef QT_NO_ACTION
     QCOMPARE(softKeyCount(nested), 0);
     QCOMPARE(softKeyCount(buttonBox), 2);
+#endif
 }
 #endif
 
diff --git a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
index 49b840f..dbd4a23 100644
--- a/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
+++ b/tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
@@ -277,9 +277,8 @@ void tst_QGraphicsEffect::draw()
     // Make sure installing the effect triggers a repaint.
     CustomEffect *effect = new CustomEffect;
     item->setGraphicsEffect(effect);
-    QTest::qWait(50);
-    QCOMPARE(effect->numRepaints, 1);
-    QCOMPARE(item->numRepaints, 1);
+    QTRY_COMPARE(effect->numRepaints, 1);
+    QTRY_COMPARE(item->numRepaints, 1);
 
     // Make sure QPainter* and QStyleOptionGraphicsItem* stays persistent
     // during QGraphicsEffect::draw/QGraphicsItem::paint.
@@ -293,26 +292,23 @@ void tst_QGraphicsEffect::draw()
 
     // Make sure updating the source triggers a repaint.
     item->update();
-    QTest::qWait(50);
-    QCOMPARE(effect->numRepaints, 1);
-    QCOMPARE(item->numRepaints, 1);
+    QTRY_COMPARE(effect->numRepaints, 1);
+    QTRY_COMPARE(item->numRepaints, 1);
     QVERIFY(effect->m_sourceChangedFlags & QGraphicsEffect::SourceInvalidated);
     effect->reset();
     item->reset();
 
     // Make sure changing the effect's bounding rect triggers a repaint.
     effect->setMargin(20);
-    QTest::qWait(50);
-    QCOMPARE(effect->numRepaints, 1);
-    QCOMPARE(item->numRepaints, 1);
+    QTRY_COMPARE(effect->numRepaints, 1);
+    QTRY_COMPARE(item->numRepaints, 1);
     effect->reset();
     item->reset();
 
     // Make sure change the item's bounding rect triggers a repaint.
     item->setRect(0, 0, 50, 50);
-    QTest::qWait(50);
-    QCOMPARE(effect->numRepaints, 1);
-    QCOMPARE(item->numRepaints, 1);
+    QTRY_COMPARE(effect->numRepaints, 1);
+    QTRY_COMPARE(item->numRepaints, 1);
     QVERIFY(effect->m_sourceChangedFlags & QGraphicsEffect::SourceBoundingRectChanged);
     effect->reset();
     item->reset();
@@ -320,8 +316,7 @@ void tst_QGraphicsEffect::draw()
     // Make sure the effect is the one to issue a repaint of the item.
     effect->doNothingInDraw = true;
     item->update();
-    QTest::qWait(50);
-    QCOMPARE(effect->numRepaints, 1);
+    QTRY_COMPARE(effect->numRepaints, 1);
     QCOMPARE(item->numRepaints, 0);
     effect->doNothingInDraw = false;
     effect->reset();
@@ -336,9 +331,8 @@ void tst_QGraphicsEffect::draw()
     item->reset();
 
     effect->setEnabled(true);
-    QTest::qWait(50);
-    QCOMPARE(effect->numRepaints, 1);
-    QCOMPARE(item->numRepaints, 1);
+    QTRY_COMPARE(effect->numRepaints, 1);
+    QTRY_COMPARE(item->numRepaints, 1);
     effect->reset();
     item->reset();
 
@@ -352,8 +346,7 @@ void tst_QGraphicsEffect::draw()
     QPointer<CustomEffect> ptr = effect;
     item->setGraphicsEffect(0);
     QVERIFY(!ptr);
-    QTest::qWait(50);
-    QCOMPARE(item->numRepaints, 1);
+    QTRY_COMPARE(item->numRepaints, 1);
 }
 
 void tst_QGraphicsEffect::opacity()
@@ -515,7 +508,6 @@ void tst_QGraphicsEffect::drawPixmapItem()
     QTRY_VERIFY(effect->repaints >= 1);
 
     item->rotate(180);
-    QTest::qWait(50);
 
     QTRY_VERIFY(effect->repaints >= 2);
 }
@@ -560,9 +552,8 @@ void tst_QGraphicsEffect::deviceCoordinateTranslateCaching()
     int numRepaints = item->numRepaints;
 
     item->translate(10, 0);
-    QTest::qWait(50);
 
-    QVERIFY(item->numRepaints == numRepaints);
+    QTRY_VERIFY(item->numRepaints == numRepaints);
 }
 
 void tst_QGraphicsEffect::inheritOpacity()
@@ -588,7 +579,6 @@ void tst_QGraphicsEffect::inheritOpacity()
     int numRepaints = item->numRepaints;
 
     rectItem->setOpacity(1);
-    QTest::qWait(50);
 
     // item should have been rerendered due to opacity changing
     QTRY_VERIFY(item->numRepaints > numRepaints);
diff --git a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
index be03481..49f110e 100644
--- a/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
+++ b/tests/auto/qgraphicseffectsource/tst_qgraphicseffectsource.cpp
@@ -48,6 +48,8 @@
 
 #include <private/qgraphicseffect_p.h>
 
+#include "../../shared/util.h"
+
 //TESTED_CLASS=
 //TESTED_FILES=
 
@@ -220,9 +222,8 @@ void tst_QGraphicsEffectSource::styleOption()
     QCOMPARE(item->numRepaints, 0);
     QCOMPARE(effect->numRepaints, 0);
     item->update();
-    QTest::qWait(50);
-    QCOMPARE(item->numRepaints, 1);
-    QCOMPARE(effect->numRepaints, 1);
+    QTRY_COMPARE(item->numRepaints, 1);
+    QTRY_COMPARE(effect->numRepaints, 1);
 }
 
 void tst_QGraphicsEffectSource::isPixmap()
@@ -255,10 +256,9 @@ void tst_QGraphicsEffectSource::update()
     QCOMPARE(effect->numRepaints, 0);
 
     effect->source()->update();
-    QTest::qWait(50);
 
-    QCOMPARE(item->numRepaints, 1);
-    QCOMPARE(effect->numRepaints, 1);
+    QTRY_COMPARE(item->numRepaints, 1);
+    QTRY_COMPARE(effect->numRepaints, 1);
 }
 
 void tst_QGraphicsEffectSource::boundingRect()
@@ -273,22 +273,20 @@ void tst_QGraphicsEffectSource::boundingRect()
     // We can at least check that the device bounding rect was correct in QGraphicsEffect::draw.
     effect->storeDeviceDependentStuff = true;
     effect->source()->update();
-    QTest::qWait(50);
     const QTransform deviceTransform = item->deviceTransform(view->viewportTransform());
-    QCOMPARE(effect->sourceDeviceBoundingRect, deviceTransform.mapRect(itemBoundingRect));
+    QTRY_COMPARE(effect->sourceDeviceBoundingRect, deviceTransform.mapRect(itemBoundingRect));
 
     // Bounding rect in logical coordinates is of course fine.
-    QCOMPARE(effect->source()->boundingRect(Qt::LogicalCoordinates), itemBoundingRect);
+    QTRY_COMPARE(effect->source()->boundingRect(Qt::LogicalCoordinates), itemBoundingRect);
     // Make sure default value is Qt::LogicalCoordinates.
-    QCOMPARE(effect->source()->boundingRect(), itemBoundingRect);
+    QTRY_COMPARE(effect->source()->boundingRect(), itemBoundingRect);
 }
 
 void tst_QGraphicsEffectSource::deviceRect()
 {
     effect->storeDeviceDependentStuff = true;
     effect->source()->update();
-    QTest::qWait(50);
-    QCOMPARE(effect->deviceRect, view->viewport()->rect());
+    QTRY_COMPARE(effect->deviceRect, view->viewport()->rect());
 }
 
 void tst_QGraphicsEffectSource::pixmap()
@@ -299,8 +297,7 @@ void tst_QGraphicsEffectSource::pixmap()
     // We can at least verify a valid pixmap from QGraphicsEffect::draw.
     effect->storeDeviceDependentStuff = true;
     effect->source()->update();
-    QTest::qWait(50);
-    QVERIFY(!effect->deviceCoordinatesPixmap.isNull());
+    QTRY_VERIFY(!effect->deviceCoordinatesPixmap.isNull());
 
     // Pixmaps in logical coordinates we can do fine.
     QPixmap pixmap1 = effect->source()->pixmap(Qt::LogicalCoordinates);
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index 89d5958..03ce45a 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -6882,8 +6882,8 @@ void tst_QGraphicsItem::cacheMode()
     testerChild2->rotate(22);
     QTest::qWait(25);
     QTRY_COMPARE(tester->repaints, 4);
-    QCOMPARE(testerChild->repaints, 4);
-    QCOMPARE(testerChild2->repaints, 3);
+    QTRY_COMPARE(testerChild->repaints, 4);
+    QTRY_COMPARE(testerChild2->repaints, 3);
     tester->resetTransform();
     testerChild->resetTransform();
     testerChild2->resetTransform();
@@ -6961,33 +6961,30 @@ void tst_QGraphicsItem::cacheMode()
     testerChild->setPos(1, 1);
     QTest::qWait(25);
     QTRY_COMPARE(tester->repaints, 11);
-    QCOMPARE(testerChild->repaints, 10);
-    QCOMPARE(testerChild2->repaints, 5);
+    QTRY_COMPARE(testerChild->repaints, 10);
+    QTRY_COMPARE(testerChild2->repaints, 5);
     tester->resetTransform();
 
     // Make a huge item
     tester->setGeometry(QRectF(-4000, -4000, 8000, 8000));
-    QTest::qWait(25);
     QTRY_COMPARE(tester->repaints, 12);
-    QCOMPARE(testerChild->repaints, 11);
-    QCOMPARE(testerChild2->repaints, 5);
+    QTRY_COMPARE(testerChild->repaints, 11);
+    QTRY_COMPARE(testerChild2->repaints, 5);
 
     // Move the large item - will cause a repaint as the
     // cache is clipped.
     tester->setPos(5, 0);
-    QTest::qWait(25);
     QTRY_COMPARE(tester->repaints, 13);
-    QCOMPARE(testerChild->repaints, 11);
-    QCOMPARE(testerChild2->repaints, 5);
+    QTRY_COMPARE(testerChild->repaints, 11);
+    QTRY_COMPARE(testerChild2->repaints, 5);
 
     // Hiding and showing should invalidate the cache
     tester->hide();
     QTest::qWait(25);
     tester->show();
-    QTest::qWait(25);
     QTRY_COMPARE(tester->repaints, 14);
-    QCOMPARE(testerChild->repaints, 12);
-    QCOMPARE(testerChild2->repaints, 6);
+    QTRY_COMPARE(testerChild->repaints, 12);
+    QTRY_COMPARE(testerChild2->repaints, 6);
 }
 
 void tst_QGraphicsItem::cacheMode2()
diff --git a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
index fb2e145..dad3279 100644
--- a/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
+++ b/tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp
@@ -44,6 +44,8 @@
 #include <QtGui>
 #include <math.h>
 
+#include "../../shared/util.h"
+
 //TESTED_CLASS=QGraphicsLayout
 //TESTED_FILES=
 
@@ -423,22 +425,15 @@ void tst_QGraphicsLayout::alternativeLayoutItems()
     view.resize(150, 150);
     view.show();
 
-    QApplication::processEvents();
-    QTest::qWait(750);
-    QApplication::processEvents();
-
-    QCOMPARE(static_cast<QGraphicsRectItem*>(li1->graphicsItem())->rect(), QRectF( 0, 0, 33, 99));
-    QCOMPARE(static_cast<QGraphicsRectItem*>(li2->graphicsItem())->rect(), QRectF(33, 0, 33, 99));
-    QCOMPARE(static_cast<QGraphicsRectItem*>(li3->graphicsItem())->rect(), QRectF(66, 0, 33, 99));
+    QTRY_COMPARE(static_cast<QGraphicsRectItem*>(li1->graphicsItem())->rect(), QRectF( 0, 0, 33, 99));
+    QTRY_COMPARE(static_cast<QGraphicsRectItem*>(li2->graphicsItem())->rect(), QRectF(33, 0, 33, 99));
+    QTRY_COMPARE(static_cast<QGraphicsRectItem*>(li3->graphicsItem())->rect(), QRectF(66, 0, 33, 99));
 
     lout->setOrientation(Qt::Vertical);
 
-    QApplication::processEvents();
-    QTest::qWait(750);
-    QApplication::processEvents();
-    QCOMPARE(static_cast<QGraphicsRectItem*>(li1->graphicsItem())->rect(), QRectF(0, 0,  99, 33));
-    QCOMPARE(static_cast<QGraphicsRectItem*>(li2->graphicsItem())->rect(), QRectF(0, 33, 99, 33));
-    QCOMPARE(static_cast<QGraphicsRectItem*>(li3->graphicsItem())->rect(), QRectF(0, 66, 99, 33));
+    QTRY_COMPARE(static_cast<QGraphicsRectItem*>(li1->graphicsItem())->rect(), QRectF(0, 0,  99, 33));
+    QTRY_COMPARE(static_cast<QGraphicsRectItem*>(li2->graphicsItem())->rect(), QRectF(0, 33, 99, 33));
+    QTRY_COMPARE(static_cast<QGraphicsRectItem*>(li3->graphicsItem())->rect(), QRectF(0, 66, 99, 33));
 
 }
 
diff --git a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
index 23b3458..e46709b 100644
--- a/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
+++ b/tests/auto/qgraphicsproxywidget/tst_qgraphicsproxywidget.cpp
@@ -787,7 +787,6 @@ void tst_QGraphicsProxyWidget::focusNextPrevChild()
     view.show();
     QApplication::setActiveWindow(&view);
     QTest::qWaitForWindowShown(&view);
-    QApplication::processEvents();
     QTRY_COMPARE(QApplication::activeWindow(), &view);
     if (hasScene) {
         scene.addItem(proxy);
@@ -836,7 +835,6 @@ void tst_QGraphicsProxyWidget::focusOutEvent()
     view.activateWindow();
     view.setFocus();
     QTest::qWaitForWindowShown(&view);
-    QApplication::processEvents();
     QTRY_VERIFY(view.isVisible());
     QTRY_COMPARE(QApplication::activeWindow(), &view);
 
@@ -989,7 +987,6 @@ void tst_QGraphicsProxyWidget::hoverEnterLeaveEvent()
 
     // in
     QTest::mouseMove(&view, QPoint(50, 50));
-    QTest::qWait(25);
     QTRY_COMPARE(widget->testAttribute(Qt::WA_UnderMouse), hasWidget ? true : false);
     // ### this attribute isn't supported
     QCOMPARE(widget->enterCount, hasWidget ? 1 : 0);
@@ -999,11 +996,10 @@ void tst_QGraphicsProxyWidget::hoverEnterLeaveEvent()
 
     // out
     QTest::mouseMove(&view, QPoint(10, 10));
-    QTest::qWait(25);
     // QTRY_COMPARE(widget->testAttribute(Qt::WA_UnderMouse), false);
     // ### this attribute isn't supported
-    QCOMPARE(widget->leaveCount, hasWidget ? 1 : 0);
-    QCOMPARE(widget->hoverLeave, (hasWidget && hoverEnabled) ? 1 : 0);
+    QTRY_COMPARE(widget->leaveCount, hasWidget ? 1 : 0);
+    QTRY_COMPARE(widget->hoverLeave, (hasWidget && hoverEnabled) ? 1 : 0);
     // does not work on all platforms
     //QCOMPARE(widget->moveCount, 0);
 
@@ -1071,7 +1067,6 @@ void tst_QGraphicsProxyWidget::hoverMoveEvent()
 
     // move a little bit
     QTest::mouseMove(&view, QPoint(60, 60));
-    QTest::qWait(12);
     QTRY_COMPARE(widget->hoverEnter, (hasWidget && hoverEnabled) ? 1 : 0);
     QCOMPARE(widget->moveCount, (hasWidget && mouseTracking) || (hasWidget && mouseDown) ? 1 : 0);
 
@@ -1097,7 +1092,6 @@ void tst_QGraphicsProxyWidget::keyPressEvent()
     view.viewport()->setFocus();
     QApplication::setActiveWindow(&view);
     QTest::qWaitForWindowShown(&view);
-    QApplication::processEvents();
     QTRY_COMPARE(QApplication::activeWindow(), &view);
 
     SubQGraphicsProxyWidget *proxy = new SubQGraphicsProxyWidget;
@@ -1305,13 +1299,11 @@ void tst_QGraphicsProxyWidget::paintEvent()
     scene.addItem(&proxy);
 
     //make sure we flush all the paint events
-    QTest::qWait(30);
     QTRY_VERIFY(proxy.paintCount > 1);
     QTest::qWait(30);
     proxy.paintCount = 0;
 
     w->update();
-    QTest::qWait(30);
     QTRY_COMPARE(proxy.paintCount, 1); //the widget should have been painted now
 }
 
@@ -1504,7 +1496,6 @@ void tst_QGraphicsProxyWidget::scrollUpdate()
     view.paintEventRegion = QRegion();
     view.npaints = 0;
     QTimer::singleShot(0, widget, SLOT(updateScroll()));
-    QTest::qWait(50);
     QTRY_COMPARE(view.npaints, 2);
     // QRect(0, 0, 200, 12) is the first update, expanded (-2, -2, 2, 2)
     // QRect(0, 12, 102, 10) is the scroll update, expanded (-2, -2, 2, 2),
@@ -2483,9 +2474,7 @@ void tst_QGraphicsProxyWidget::popup_basic()
     QTest::mousePress(view.viewport(), Qt::LeftButton, 0,
 		      view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center())));
 
-    QTest::qWait(12);
-
-    QCOMPARE(box->pos(), QPoint());
+    QTRY_COMPARE(box->pos(), QPoint());
 
     QCOMPARE(proxy->childItems().count(), 1);
     QGraphicsProxyWidget *child = (QGraphicsProxyWidget*)(proxy->childItems())[0];
@@ -2498,7 +2487,6 @@ void tst_QGraphicsProxyWidget::popup_basic()
         QSKIP("Does not work due to SH_Combobox_Popup", SkipAll);
     QCOMPARE(child->widget()->parent(), static_cast<QObject*>(box));
 
-    QTest::qWait(12);
     QTRY_COMPARE(proxy->pos(), QPointF(box->pos()));
     QCOMPARE(child->x(), qreal(box->x()));
     QCOMPARE(child->y(), qreal(box->rect().bottom()));
@@ -2583,13 +2571,11 @@ void tst_QGraphicsProxyWidget::changingCursor_basic()
     // in
     QTest::mouseMove(view.viewport(), view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center())));
     sendMouseMove(view.viewport(), view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center())));
-    QTest::qWait(12);
     QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::IBeamCursor);
 
     // out
     QTest::mouseMove(view.viewport(), QPoint(1, 1));
     sendMouseMove(view.viewport(), QPoint(1, 1));
-    QTest::qWait(12);
     QTRY_COMPARE(view.viewport()->cursor().shape(), Qt::ArrowCursor);
 #endif
 }
@@ -2615,9 +2601,8 @@ void tst_QGraphicsProxyWidget::tooltip_basic()
 
     // in
     QTest::mouseMove(view.viewport(), view.mapFromScene(proxy->mapToScene(proxy->boundingRect().center())));
-    QTest::qWait(3000);
 
-    QCOMPARE(proxy->childItems().count(), 1);
+    QTRY_COMPARE(proxy->childItems().count(), 1);
     QGraphicsProxyWidget *child = (QGraphicsProxyWidget*)(proxy->childItems())[0];
     QVERIFY(child->isWidget());
     QVERIFY(child->widget());
@@ -3348,7 +3333,6 @@ void tst_QGraphicsProxyWidget::updateAndDelete()
 #ifdef Q_WS_X11
     qt_x11_wait_for_window_manager(&view);
 #endif
-    QTest::qWait(20);
     QTRY_VERIFY(view.npaints > 0);
 
     const QRect itemDeviceBoundingRect = proxy->deviceTransform(view.viewportTransform())
@@ -3361,8 +3345,7 @@ void tst_QGraphicsProxyWidget::updateAndDelete()
     // Update and hide.
     proxy->update();
     proxy->hide();
-    QTest::qWait(50);
-    QCOMPARE(view.npaints, 1);
+    QTRY_COMPARE(view.npaints, 1);
     QCOMPARE(view.paintEventRegion, expectedRegion);
 
     proxy->show();
@@ -3373,8 +3356,7 @@ void tst_QGraphicsProxyWidget::updateAndDelete()
     // Update and delete.
     proxy->update();
     delete proxy;
-    QTest::qWait(50);
-    QCOMPARE(view.npaints, 1);
+    QTRY_COMPARE(view.npaints, 1);
     QCOMPARE(view.paintEventRegion, expectedRegion);
 }
 
@@ -3439,7 +3421,6 @@ void tst_QGraphicsProxyWidget::clickFocus()
         qt_x11_wait_for_window_manager(&view);
 #endif
         QApplication::setActiveWindow(&view);
-        QTest::qWait(25);
         QTRY_COMPARE(QApplication::activeWindow(), &view);
 
         QVERIFY(!proxy->hasFocus());
diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index f27f469..35ebbd9 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -385,7 +385,7 @@ void tst_QHttpNetworkConnection::post_data()
     QTest::addColumn<int>("contentLength");
     QTest::addColumn<int>("downloadSize");
 
-    QTest::newRow("success-internal") << "http://" << QtNetworkSettings::serverName() << "/cgi-bin/echo.cgi" << ushort(80) << false << "7 bytes" << 200 << "OK" << 7 << 7;
+    QTest::newRow("success-internal") << "http://" << QtNetworkSettings::serverName() << "/qtest/cgi-bin/echo.cgi" << ushort(80) << false << "7 bytes" << 200 << "OK" << 7 << 7;
     QTest::newRow("failure-internal") << "http://" << QtNetworkSettings::serverName() << "/t" << ushort(80) << false << "Hello World" << 404 << "Not Found" << -1 << 997 + QtNetworkSettings::serverName().size();
 }
 
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index e269092..c238f59 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -1410,10 +1410,10 @@ void tst_QNetworkReply::deleteFromHttp_data()
     // for status codes to expect, see http://www.w3.org/Protocols/rfc2616/rfc2616-sec9.html
 
     QTest::newRow("405-method-not-allowed") << QUrl("http://" + QtNetworkSettings::serverName() + "/index.html") << 405 << QNetworkReply::ContentOperationNotPermittedError;
-    QTest::newRow("200-ok") << QUrl("http://" + QtNetworkSettings::serverName() + "/cgi-bin/http-delete.cgi?200-ok") << 200 << QNetworkReply::NoError;
-    QTest::newRow("202-accepted") << QUrl("http://" + QtNetworkSettings::serverName() + "/cgi-bin/http-delete.cgi?202-accepted") << 202 << QNetworkReply::NoError;
-    QTest::newRow("204-no-content") << QUrl("http://" + QtNetworkSettings::serverName() + "/cgi-bin/http-delete.cgi?204-no-content") << 204 << QNetworkReply::NoError;
-    QTest::newRow("404-not-found") << QUrl("http://" + QtNetworkSettings::serverName() + "/cgi-bin/http-delete.cgi?404-not-found") << 404 << QNetworkReply::ContentNotFoundError;
+    QTest::newRow("200-ok") << QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/cgi-bin/http-delete.cgi?200-ok") << 200 << QNetworkReply::NoError;
+    QTest::newRow("202-accepted") << QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/cgi-bin/http-delete.cgi?202-accepted") << 202 << QNetworkReply::NoError;
+    QTest::newRow("204-no-content") << QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/cgi-bin/http-delete.cgi?204-no-content") << 204 << QNetworkReply::NoError;
+    QTest::newRow("404-not-found") << QUrl("http://" + QtNetworkSettings::serverName() + "/qtest/cgi-bin/http-delete.cgi?404-not-found") << 404 << QNetworkReply::ContentNotFoundError;
 }
 
 void tst_QNetworkReply::deleteFromHttp()
@@ -3886,10 +3886,10 @@ void tst_QNetworkReply::authorizationError_data()
     QTest::addColumn<QString>("httpBody");
 
     QTest::newRow("unknown-authorization-method") << "http://" + QtNetworkSettings::serverName() +
-                                                     "/cgi-bin/http-unknown-authentication-method.cgi?401-authorization-required" << 1 << 1
+                                                     "/qtest/cgi-bin/http-unknown-authentication-method.cgi?401-authorization-required" << 1 << 1
                                                   << int(QNetworkReply::AuthenticationRequiredError) << 401 << "authorization required";
     QTest::newRow("unknown-proxy-authorization-method") << "http://" + QtNetworkSettings::serverName() +
-                                                           "/cgi-bin/http-unknown-authentication-method.cgi?407-proxy-authorization-required" << 1 << 1
+                                                           "/qtest/cgi-bin/http-unknown-authentication-method.cgi?407-proxy-authorization-required" << 1 << 1
                                                         << int(QNetworkReply::ProxyAuthenticationRequiredError) << 407
                                                         << "authorization required";
 }
diff --git a/tests/auto/qpathclipper/tst_qpathclipper.cpp b/tests/auto/qpathclipper/tst_qpathclipper.cpp
index 38d253a..db5a13e 100644
--- a/tests/auto/qpathclipper/tst_qpathclipper.cpp
+++ b/tests/auto/qpathclipper/tst_qpathclipper.cpp
@@ -95,6 +95,8 @@ private slots:
 
     void task209056();
     void task251909();
+
+    void qtbug3778();
 };
 
 Q_DECLARE_METATYPE(QPainterPath)
@@ -1346,6 +1348,33 @@ void tst_QPathClipper::task251909()
     QVERIFY(result.elementCount() <= 5);
 }
 
+void tst_QPathClipper::qtbug3778()
+{
+    QPainterPath path1;
+    path1.moveTo(200, 3.22409e-5);
+    // e-5 and higher leads to a bug
+    // Using 3.22409e-4 starts to work correctly
+    path1.lineTo(0, 0);
+    path1.lineTo(1.07025e-13, 1450);
+    path1.lineTo(750, 950);
+    path1.lineTo(950, 750);
+    path1.lineTo(200, 3.22409e-13);
+
+    QPainterPath path2;
+    path2.moveTo(0, 0);
+    path2.lineTo(200, 800);
+    path2.lineTo(600, 1500);
+    path2.lineTo(1500, 1400);
+    path2.lineTo(1900, 1200);
+    path2.lineTo(2000, 1000);
+    path2.lineTo(1400, 0);
+    path2.lineTo(0, 0);
+
+    QPainterPath p12 = path1.intersected(path2);
+
+    QVERIFY(p12.contains(QPointF(100, 100)));
+}
+
 QTEST_APPLESS_MAIN(tst_QPathClipper)
 
 
diff --git a/tests/auto/qscriptengine/tst_qscriptengine.cpp b/tests/auto/qscriptengine/tst_qscriptengine.cpp
index 3c6c7b2..25d8e3df 100644
--- a/tests/auto/qscriptengine/tst_qscriptengine.cpp
+++ b/tests/auto/qscriptengine/tst_qscriptengine.cpp
@@ -104,6 +104,8 @@ private slots:
     void getSetGlobalObject();
     void globalObjectProperties();
     void globalObjectGetterSetterProperty();
+    void customGlobalObjectWithPrototype();
+    void globalObjectWithCustomPrototype();
     void builtinFunctionNames_data();
     void builtinFunctionNames();
     void checkSyntax_data();
@@ -1177,6 +1179,131 @@ void tst_QScriptEngine::globalObjectGetterSetterProperty()
     QVERIFY(global.property("baz").equals(789));
 }
 
+void tst_QScriptEngine::customGlobalObjectWithPrototype()
+{
+    for (int x = 0; x < 2; ++x) {
+        QScriptEngine engine;
+        QScriptValue wrap = engine.newObject();
+        QScriptValue global = engine.globalObject();
+        QScriptValue originalGlobalProto = global.prototype();
+        if (!x) {
+            // Set prototype before setting global object
+            wrap.setPrototype(global);
+            QVERIFY(wrap.prototype().strictlyEquals(global));
+            engine.setGlobalObject(wrap);
+        } else {
+            // Set prototype after setting global object
+            engine.setGlobalObject(wrap);
+            wrap.setPrototype(global);
+            QVERIFY(wrap.prototype().strictlyEquals(global));
+        }
+        {
+            QScriptValue ret = engine.evaluate("print");
+            QVERIFY(ret.isFunction());
+            QVERIFY(ret.strictlyEquals(wrap.property("print")));
+        }
+        {
+            QScriptValue ret = engine.evaluate("this.print");
+            QVERIFY(ret.isFunction());
+            QVERIFY(ret.strictlyEquals(wrap.property("print")));
+        }
+        {
+            QScriptValue ret = engine.evaluate("hasOwnProperty('print')");
+            QVERIFY(ret.isBool());
+            QVERIFY(!ret.toBool());
+        }
+        {
+            QScriptValue ret = engine.evaluate("this.hasOwnProperty('print')");
+            QVERIFY(ret.isBool());
+            QVERIFY(!ret.toBool());
+        }
+
+        QScriptValue anotherProto = engine.newObject();
+        anotherProto.setProperty("anotherProtoProperty", 123);
+        global.setPrototype(anotherProto);
+        {
+            QScriptValue ret = engine.evaluate("print");
+            QVERIFY(ret.isFunction());
+            QVERIFY(ret.strictlyEquals(wrap.property("print")));
+        }
+        {
+            QScriptValue ret = engine.evaluate("anotherProtoProperty");
+            QVERIFY(ret.isNumber());
+            QVERIFY(ret.strictlyEquals(wrap.property("anotherProtoProperty")));
+        }
+        {
+            QScriptValue ret = engine.evaluate("this.anotherProtoProperty");
+            QVERIFY(ret.isNumber());
+            QVERIFY(ret.strictlyEquals(wrap.property("anotherProtoProperty")));
+        }
+
+        wrap.setPrototype(anotherProto);
+        {
+            QScriptValue ret = engine.evaluate("print");
+            QVERIFY(ret.isError());
+            QCOMPARE(ret.toString(), QString::fromLatin1("ReferenceError: Can't find variable: print"));
+        }
+        {
+            QScriptValue ret = engine.evaluate("anotherProtoProperty");
+            QVERIFY(ret.isNumber());
+            QVERIFY(ret.strictlyEquals(wrap.property("anotherProtoProperty")));
+        }
+        QVERIFY(global.prototype().strictlyEquals(anotherProto));
+
+        global.setPrototype(originalGlobalProto);
+        engine.setGlobalObject(global);
+        {
+            QScriptValue ret = engine.evaluate("anotherProtoProperty");
+            QVERIFY(ret.isError());
+            QCOMPARE(ret.toString(), QString::fromLatin1("ReferenceError: Can't find variable: anotherProtoProperty"));
+        }
+        {
+            QScriptValue ret = engine.evaluate("print");
+            QVERIFY(ret.isFunction());
+            QVERIFY(ret.strictlyEquals(global.property("print")));
+        }
+        QVERIFY(!anotherProto.property("print").isValid());
+    }
+}
+
+void tst_QScriptEngine::globalObjectWithCustomPrototype()
+{
+    QScriptEngine engine;
+    QScriptValue proto = engine.newObject();
+    proto.setProperty("protoProperty", 123);
+    QScriptValue global = engine.globalObject();
+    QScriptValue originalProto = global.prototype();
+    global.setPrototype(proto);
+    {
+        QScriptValue ret = engine.evaluate("protoProperty");
+        QVERIFY(ret.isNumber());
+        QVERIFY(ret.strictlyEquals(global.property("protoProperty")));
+    }
+    {
+        QScriptValue ret = engine.evaluate("this.protoProperty");
+        QVERIFY(ret.isNumber());
+        QVERIFY(ret.strictlyEquals(global.property("protoProperty")));
+    }
+    {
+        QScriptValue ret = engine.evaluate("hasOwnProperty('protoProperty')");
+        QVERIFY(ret.isBool());
+        QVERIFY(!ret.toBool());
+    }
+    {
+        QScriptValue ret = engine.evaluate("this.hasOwnProperty('protoProperty')");
+        QVERIFY(ret.isBool());
+        QVERIFY(!ret.toBool());
+    }
+
+    // Custom prototype set from JS
+    {
+        QScriptValue ret = engine.evaluate("this.__proto__ = { 'a': 123 }; a");
+        QVERIFY(ret.isNumber());
+        QEXPECT_FAIL("", "QTBUG-9737", Continue);
+        QVERIFY(ret.strictlyEquals(global.property("a")));
+    }
+}
+
 void tst_QScriptEngine::builtinFunctionNames_data()
 {
     QTest::addColumn<QString>("expression");
diff --git a/tests/auto/qsslsocket/tst_qsslsocket.cpp b/tests/auto/qsslsocket/tst_qsslsocket.cpp
index 4397ab1..2bfce74 100644
--- a/tests/auto/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/qsslsocket/tst_qsslsocket.cpp
@@ -1535,6 +1535,7 @@ void tst_QSslSocket::verifyMode()
     loop.exec();
 
     QVERIFY(clientSocket.isEncrypted());
+    qDebug() << server.socket->sslErrors();
     QVERIFY(server.socket->sslErrors().isEmpty());
 }
 
diff --git a/tests/auto/qtabwidget/tst_qtabwidget.cpp b/tests/auto/qtabwidget/tst_qtabwidget.cpp
index 4491fb3..204c27a 100644
--- a/tests/auto/qtabwidget/tst_qtabwidget.cpp
+++ b/tests/auto/qtabwidget/tst_qtabwidget.cpp
@@ -45,6 +45,7 @@
 #include <qdebug.h>
 #include <qapplication.h>
 #include <qlabel.h>
+#include <qboxlayout.h>
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -120,6 +121,8 @@ class tst_QTabWidget:public QObject {
     void clear();
     void keyboardNavigation();
     void paintEventCount();
+    void heightForWidth();
+    void heightForWidth_data();
 
   private:
     int addPage();
@@ -621,6 +624,50 @@ void tst_QTabWidget::paintEventCount()
     QCOMPARE(tab2->count, 1);
 }
 
+void tst_QTabWidget::heightForWidth_data()
+{
+    QTest::addColumn<int>("tabPosition");
+    QTest::newRow("West") << int(QTabWidget::West);
+    QTest::newRow("North") << int(QTabWidget::North);
+    QTest::newRow("East") << int(QTabWidget::East);
+    QTest::newRow("South") << int(QTabWidget::South);
+}
+
+void tst_QTabWidget::heightForWidth()
+{
+    QFETCH(int, tabPosition);
+
+    QWidget *window = new QWidget;
+    QVBoxLayout *lay = new QVBoxLayout(window);
+    lay->setMargin(0);
+    lay->setSpacing(0);
+    QTabWidget *tabWid = new QTabWidget(window);
+    QWidget *w = new QWidget;
+    tabWid->addTab(w, QLatin1String("HFW page"));
+    tabWid->setTabPosition(QTabWidget::TabPosition(tabPosition));
+    QVBoxLayout *lay2 = new QVBoxLayout(w);
+    QLabel *label = new QLabel("Label with wordwrap turned on makes it trade height for width."
+                               " Make it a really long text so that it spans on several lines"
+                               " when the label is on its narrowest."
+                               " I don't like to repeat myself."
+                               " I don't like to repeat myself."
+                               " I don't like to repeat myself."
+                               " I don't like to repeat myself."
+                               );
+    label->setWordWrap(true);
+    lay2->addWidget(label);
+    lay2->setMargin(0);
+
+    lay->addWidget(tabWid);
+    int h = window->heightForWidth(160);
+    window->resize(160, h);
+    window->show();
+
+    QTest::qWaitForWindowShown(window);
+    QVERIFY(label->height() >= label->heightForWidth(label->width()));
+
+    delete window;
+}
 
 QTEST_MAIN(tst_QTabWidget)
 #include "tst_qtabwidget.moc"
diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp
index 2de189d..75a4c62 100644
--- a/tests/auto/qtreeview/tst_qtreeview.cpp
+++ b/tests/auto/qtreeview/tst_qtreeview.cpp
@@ -215,6 +215,7 @@ private slots:
     void addRowsWhileSectionsAreHidden();
     void filterProxyModelCrash();
     void styleOptionViewItem();
+    void keyboardNavigationWithDisabled();
 
     // task-specific tests:
     void task174627_moveLeftToRoot();
@@ -3753,5 +3754,36 @@ void tst_QTreeView::taskQTBUG_9216_setSizeAndUniformRowHeightsWrongRepaint()
     QTRY_VERIFY(view.painted > 0);
 }
 
+void tst_QTreeView::keyboardNavigationWithDisabled()
+{
+    QTreeView view;
+    QStandardItemModel model(90, 0);
+    for (int i = 0; i < 90; i ++) {
+        model.setItem(i, new QStandardItem(QString::number(i)));
+        model.item(i)->setEnabled(i%6 == 0);
+    }
+    view.setModel(&model);
+
+    view.resize(200, view.visualRect(model.index(0,0)).height()*10);
+    view.show();
+    QApplication::setActiveWindow(&view);
+    QTest::qWaitForWindowShown(&view);
+    QTRY_VERIFY(view.isActiveWindow());
+
+    view.setCurrentIndex(model.index(1, 0));
+    QTest::keyClick(view.viewport(), Qt::Key_Up);
+    QCOMPARE(view.currentIndex(), model.index(0, 0));
+    QTest::keyClick(view.viewport(), Qt::Key_Down);
+    QCOMPARE(view.currentIndex(), model.index(6, 0));
+    QTest::keyClick(view.viewport(), Qt::Key_PageDown);
+    QCOMPARE(view.currentIndex(), model.index(18, 0));
+    QTest::keyClick(view.viewport(), Qt::Key_Down);
+    QCOMPARE(view.currentIndex(), model.index(24, 0));
+    QTest::keyClick(view.viewport(), Qt::Key_PageUp);
+    QCOMPARE(view.currentIndex(), model.index(12, 0));
+    QTest::keyClick(view.viewport(), Qt::Key_Up);
+    QCOMPARE(view.currentIndex(), model.index(6, 0));
+}
+
 QTEST_MAIN(tst_QTreeView)
 #include "tst_qtreeview.moc"
diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp
index a6c0d35..be0d708 100644
--- a/tests/auto/qxmlquery/tst_qxmlquery.cpp
+++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp
@@ -2040,7 +2040,7 @@ void tst_QXmlQuery::fnDocNetworkAccessSuccess_data() const
         return;
 
     QTest::newRow("http scheme")
-        << QUrl(QString("http://" + QtNetworkSettings::serverName() + "/qxmlquery/wellFormed.xml"))
+        << QUrl(QString("http://" + QtNetworkSettings::serverName() + "/qtest/qxmlquery/wellFormed.xml"))
         << QByteArray("<!-- a comment --><e from=\"http\">Some Text</e>");
 
     QTest::newRow("ftp scheme")
@@ -2103,10 +2103,10 @@ void tst_QXmlQuery::fnDocNetworkAccessFailure_data() const
         return;
 
     QTest::newRow("http scheme, not well-formed")
-        << QUrl(QString("http://" + QtNetworkSettings::serverName() + "/qxmlquery/notWellformed.xml"));
+        << QUrl(QString("http://" + QtNetworkSettings::serverName() + "/qtest/qxmlquery/notWellformed.xml"));
 
     QTest::newRow("https scheme, not well-formed")
-        << QUrl(QString("https://" + QtNetworkSettings::serverName() + "/qxmlquery/notWellformedViaHttps.xml"));
+        << QUrl(QString("https://" + QtNetworkSettings::serverName() + "/qtest/qxmlquery/notWellformedViaHttps.xml"));
 
     QTest::newRow("https scheme, nonexistent host")
         << QUrl(QLatin1String("https://this.host.does.not.exist.I.SWear"));
@@ -2564,7 +2564,7 @@ void tst_QXmlQuery::setQueryQUrlSuccess_data() const
         << QByteArray("This was received via FTP");
 
     QTest::newRow("A valid query via the http scheme")
-        << QUrl::fromEncoded(QString("http://" + QtNetworkSettings::serverName() + "/qxmlquery/viaHttp.xq").toLatin1())
+        << QUrl::fromEncoded(QString("http://" + QtNetworkSettings::serverName() + "/qtest/qxmlquery/viaHttp.xq").toLatin1())
         << QByteArray("This was received via HTTP.");
 }
 
@@ -2630,11 +2630,11 @@ void tst_QXmlQuery::setQueryQUrlFailure_data() const
 
     QTest::newRow("A query via http:// that is completely empty, but readable.")
         << QUrl::fromEncoded(QString(
-                "http://" + QtNetworkSettings::serverName() + "/qxmlquery/completelyEmptyQuery.xq").toLatin1());
+                "http://" + QtNetworkSettings::serverName() + "/qtest/qxmlquery/completelyEmptyQuery.xq").toLatin1());
 
     QTest::newRow("A query via ftp:// that is completely empty, but readable.")
         << QUrl::fromEncoded(QString(
-                "ftp://" + QtNetworkSettings::serverName() + "qxmlquery/completelyEmptyQuery.xq").toLatin1());
+                "ftp://" + QtNetworkSettings::serverName() + "/pub/qxmlquery/completelyEmptyQuery.xq").toLatin1());
 
 }
 
diff --git a/tests/benchmarks/corelib/tools/qstringbuilder/main.cpp b/tests/benchmarks/corelib/tools/qstringbuilder/main.cpp
index 9bd146f..d46a36b 100644
--- a/tests/benchmarks/corelib/tools/qstringbuilder/main.cpp
+++ b/tests/benchmarks/corelib/tools/qstringbuilder/main.cpp
@@ -428,37 +428,6 @@ private:
     std::string stdr;
 };
 
-
-//void operator%(QString, int) {}
-
-int main(int argc, char *argv[])
-{
-    //qDebug() << (QString("xx") * QLatin1String("y")).toString();
-    //42 % 3; // Sanity test, should always work.
-    //QString("x") % 2; // Sanity test, should only compile when the 
-    // operator%(QString, int) is visible.
-
-    if (argc == 2 && (QLatin1String(argv[1]) == QLatin1String("--run-builder")
-                   || QLatin1String(argv[1]) == QLatin1String("-b"))) {
-        tst_qstringbuilder test;
-        return test.run_builder();
-    }
-
-    if (argc == 2 && (QLatin1String(argv[1]) == QLatin1String("--run-traditional")
-                   || QLatin1String(argv[1]) == QLatin1String("-t"))) {
-        tst_qstringbuilder test;
-        return test.run_traditional();
-    }
-
-    if (argc == 1) {
-        QCoreApplication app(argc, argv);
-        QStringList args = app.arguments();
-        tst_qstringbuilder test;
-        return QTest::qExec(&test, argc, argv);
-    }
-
-    qDebug() << "Usage: " << argv[0] << " [--run-builder|-r|--run-traditional|-t]";
-}
-
+QTEST_MAIN(tst_qstringbuilder)
 
 #include "main.moc"
diff --git a/tests/benchmarks/gui/painting/qtbench/benchmarktests.h b/tests/benchmarks/gui/painting/qtbench/benchmarktests.h
index 362d121..824825b 100644
--- a/tests/benchmarks/gui/painting/qtbench/benchmarktests.h
+++ b/tests/benchmarks/gui/painting/qtbench/benchmarktests.h
@@ -540,7 +540,7 @@ public:
         case StaticTextWithMaximumSizeMode: {
             QStaticText staticText;
             m_size = (p->boundingRect(m_bounds, 0, m_text)).size();
-            staticText.setMaximumSize(m_size + QSize(10, 10));
+            staticText.setTextWidth(m_size.width() + 10);
             staticText.setText(m_text);
             staticText.prepare(p->transform(), p->font());
             m_staticTexts.append(staticText);
@@ -551,7 +551,7 @@ public:
             for (int i=0; i<iterations; ++i) {
                 QStaticText staticText;
                 staticText.setPerformanceHint(QStaticText::AggressiveCaching);
-                staticText.setMaximumSize(m_size + QSize(10, 10));
+                staticText.setTextWidth(m_size.width() + 10);
                 staticText.setText(m_text);
                 staticText.prepare(p->transform(), p->font());
                 m_staticTexts.append(staticText);
diff --git a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
index 26308e9..81f6f25 100644
--- a/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
+++ b/tests/benchmarks/network/access/qfile_vs_qnetworkaccessmanager/main.cpp
@@ -46,7 +46,6 @@
 #include <QtNetwork/qnetworkaccessmanager.h>
 #include <QtCore/QTemporaryFile>
 #include <QtCore/QFile>
-#include "../../../../auto/network-settings.h"
 
 class qfile_vs_qnetworkaccessmanager : public QObject
 {
@@ -78,11 +77,15 @@ void qfile_vs_qnetworkaccessmanager::initTestCase()
 {
     testFile.open();
     QByteArray qba(1*1024*1024, 'x'); // 1 MB
+#ifdef Q_OS_SYMBIAN
+    for (int i = 0; i < 10; i++) { // for Symbian only 10 MB
+#else
     for (int i = 0; i < 100; i++) {
+#endif
         testFile.write(qba);
         testFile.flush();
         size += qba.size();
-    } // 100 MB
+    } // 100 MB or 10 MB
     testFile.reset();
 }
 
@@ -105,7 +108,7 @@ void qfile_vs_qnetworkaccessmanager::qnamFileRead()
 {
     QNetworkAccessManager manager;
     QTime t;
-    QNetworkRequest request(QUrl(testFile.fileName()));
+    QNetworkRequest request(QUrl::fromLocalFile(testFile.fileName()));
 
     // do 3 dry runs for cache warmup
     qnamFileRead_iteration(manager, request);
diff --git a/tools/assistant/lib/fulltextsearch/qclucene-config_p.h b/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
index 0c70718..387d64d 100644
--- a/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
+++ b/tools/assistant/lib/fulltextsearch/qclucene-config_p.h
@@ -314,14 +314,12 @@ configure.
 #define _CL_HAVE_SYS_TYPES_H  1
 #endif
 
-// Do not use the tchar.h that ships with mingw, this causes the qt build to
-// fail (211547, 211401, etc...), reuse the replacement as with any other compiler
-// #if defined(__MINGW32__)
-//     /* Define to 1 if you have the <tchar.h> header file. */
-// #   ifndef _CL_HAVE_TCHAR_H
-// #   define _CL_HAVE_TCHAR_H  1
-// #   endif
-// #endif
+#if defined(__MINGW32__)
+     /* Define to 1 if you have the <tchar.h> header file. */
+ #   ifndef _CL_HAVE_TCHAR_H
+ #   define _CL_HAVE_TCHAR_H  1
+ #   endif
+#endif
 
 #if defined(__MINGW32__) || defined(__SUNPRO_CC) || defined(__SUNPRO_C)
     /* Define to 1 if you have the `tell' function. */
diff --git a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
index f4b744d..206725b 100644
--- a/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
+++ b/tools/assistant/lib/fulltextsearch/qclucene_global_p.h
@@ -36,7 +36,7 @@
 #include <QtCore/QChar>
 #include <QtCore/QString>
 
-#if !defined(_MSC_VER) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
+#if !defined(_MSC_VER) && !defined(__MINGW32__) && defined(_CL_HAVE_WCHAR_H) && defined(_CL_HAVE_WCHAR_T)
 #   if !defined(TCHAR)
 #       define TCHAR wchar_t
 #   endif
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp
index 74bebb2..60b8dcc 100644
--- a/tools/configure/environment.cpp
+++ b/tools/configure/environment.cpp
@@ -73,7 +73,7 @@ struct CompilerInfo{
 } compiler_info[] = {
     // The compilers here are sorted in a reversed-preferred order
     {CC_BORLAND, "Borland C++",                                                    0, "bcc32.exe"},
-    {CC_MINGW,   "MinGW (Minimalist GNU for Windows)",                             0, "mingw32-gcc.exe"},
+    {CC_MINGW,   "MinGW (Minimalist GNU for Windows)",                             0, "g++.exe"},
     {CC_INTEL,   "Intel(R) C++ Compiler for 32-bit applications",                  0, "icl.exe"}, // xilink.exe, xilink5.exe, xilink6.exe, xilib.exe
     {CC_MSVC6,   "Microsoft (R) 32-bit C/C++ Optimizing Compiler (6.x)",           "Software\\Microsoft\\VisualStudio\\6.0\\Setup\\Microsoft Visual C++\\ProductDir", "cl.exe"}, // link.exe, lib.exe
     {CC_NET2002, "Microsoft (R) 32-bit C/C++ Optimizing Compiler.NET 2002 (7.0)",  "Software\\Microsoft\\VisualStudio\\7.0\\Setup\\VC\\ProductDir", "cl.exe"}, // link.exe, lib.exe
diff --git a/tools/qtestlib/wince/cetest/cetest.pro b/tools/qtestlib/wince/cetest/cetest.pro
index 43ed18e..82747da 100644
--- a/tools/qtestlib/wince/cetest/cetest.pro
+++ b/tools/qtestlib/wince/cetest/cetest.pro
@@ -13,8 +13,7 @@ DEFINES        += QT_BUILD_QMAKE QT_BOOTSTRAPPED QT_NO_CODECS QT_LITE_UNICODE QT
                   QT_NO_STL QT_NO_COMPRESS QT_NO_DATASTREAM  \
                   QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_NO_THREAD \
                   QT_NO_SYSTEMLOCALE QT_NO_GEOM_VARIANT \
-                  QT_NODLL QT_NO_QOBJECT \
-                  QT_BUILD_QMAKE_NO_GENERATORS
+                  QT_NODLL QT_NO_QOBJECT
 
 INCLUDEPATH = \
               $$QT_SOURCE_TREE/tools/qtestlib/ce/cetest \
diff --git a/tools/qtestlib/wince/cetest/qmake_include.pri b/tools/qtestlib/wince/cetest/qmake_include.pri
index 8b415b0..35fbc64 100644
--- a/tools/qtestlib/wince/cetest/qmake_include.pri
+++ b/tools/qtestlib/wince/cetest/qmake_include.pri
@@ -5,7 +5,9 @@ SOURCES += \
            $$QT_SOURCE_TREE/qmake/option.cpp \
            $$QT_SOURCE_TREE/qmake/project.cpp \
            $$QT_SOURCE_TREE/qmake/property.cpp \
+           $$QT_SOURCE_TREE/qmake/generators/metamakefile.cpp \
            $$QT_SOURCE_TREE/qmake/generators/symbian/initprojectdeploy_symbian.cpp \
            $$QT_SOURCE_TREE/tools/shared/symbian/epocroot.cpp \
            $$QT_SOURCE_TREE/tools/shared/windows/registry.cpp
 
+DEFINES += QT_QMAKE_PARSER_ONLY
diff --git a/tools/runonphone/main.cpp b/tools/runonphone/main.cpp
index 80e5e34..37e4548 100644
--- a/tools/runonphone/main.cpp
+++ b/tools/runonphone/main.cpp
@@ -55,18 +55,20 @@
 void printUsage(QTextStream& outstream, QString exeName)
 {
     outstream << exeName << " [options] [program] [program arguments]" << endl
-            << "-s, --sis <file>                     specify sis file to install" << endl
-            << "-p, --portname <COMx>                specify COM port to use by device name" << endl
-            << "-f, --portfriendlyname <substring>   specify COM port to use by friendly name" << endl
-            << "-t, --timeout <milliseconds>         terminate test if timeout occurs" << endl
-            << "-v, --verbose                        show debugging output" << endl
-            << "-q, --quiet                          hide progress messages" << endl
+            << "-s, --sis <file>                         specify sis file to install" << endl
+            << "-p, --portname <COMx>                    specify COM port to use by device name" << endl
+            << "-f, --portfriendlyname <substring>       specify COM port to use by friendly name" << endl
+            << "-t, --timeout <milliseconds>             terminate test if timeout occurs" << endl
+            << "-v, --verbose                            show debugging output" << endl
+            << "-q, --quiet                              hide progress messages" << endl
+            << "-d, --download <remote file> <local file> copy file from phone to PC after running test" << endl
             << endl
             << "USB COM ports can usually be autodetected, use -p or -f to force a specific port." << endl
             << "If using System TRK, it is possible to copy the program directly to sys/bin on the phone." << endl
             << "-s can be used with both System and Application TRK to install the program" << endl;
 }
 
+#define CHECK_PARAMETER_EXISTS if(!it.hasNext()) { printUsage(outstream, args[0]); return 1; }
 int main(int argc, char *argv[])
 {
     QCoreApplication a(argc, argv);
@@ -79,59 +81,59 @@ int main(int argc, char *argv[])
     QStringList args = QCoreApplication::arguments();
     QTextStream outstream(stdout);
     QTextStream errstream(stderr);
+    QString downloadRemoteFile;
+    QString downloadLocalFile;
     int loglevel=1;
     int timeout=0;
-    for (int i=1;i<args.size();i++) {
-        QString arg = args.at(i);
+    QListIterator<QString> it(args);
+    it.next(); //skip name of program
+    while (it.hasNext()) {
+        QString arg = it.next();
+
         if (arg.startsWith("-")) {
-            if (args.size() < i+2) {
-                errstream << "Command line missing argument parameters" << endl;
-                return 1;
+            if (arg == "--portname" || arg == "-p") {
+                CHECK_PARAMETER_EXISTS
+                serialPortName = it.next();
             }
-            QString param = args.at(i+1);
-            if (arg.compare("--portname", Qt::CaseSensitive) == 0
-               || arg.compare("-p", Qt::CaseSensitive) == 0) {
-                serialPortName = param;
-                i++;
+            else if (arg == "--portfriendlyname" || arg == "-f") {
+                CHECK_PARAMETER_EXISTS
+                serialPortFriendlyName = it.next();
             }
-            else if (arg.compare("--portfriendlyname", Qt::CaseSensitive) == 0
-                    || arg.compare("-f", Qt::CaseSensitive) == 0) {
-                serialPortFriendlyName = param;
-                i++;
+            else if (arg == "--sis" || arg == "-s") {
+                CHECK_PARAMETER_EXISTS
+                sisFile = it.next();
             }
-            else if (arg.compare("--sis", Qt::CaseSensitive) == 0
-                    || arg.compare("-s", Qt::CaseSensitive) == 0) {
-                sisFile = param;
-                i++;
+            else if (arg == "--download" || arg == "-d") {
+                CHECK_PARAMETER_EXISTS
+                downloadRemoteFile = it.next();
+                CHECK_PARAMETER_EXISTS
+                downloadLocalFile = it.next();
             }
-            else if (arg.compare("--timeout", Qt::CaseSensitive) == 0
-                    || arg.compare("-t", Qt::CaseSensitive) == 0) {
+            else if (arg == "--timeout" || arg == "-t") {
+                CHECK_PARAMETER_EXISTS
                 bool ok;
-                timeout = param.toInt(&ok);
+                timeout = it.next().toInt(&ok);
                 if (!ok) {
                     errstream << "Timeout must be specified in milliseconds" << endl;
                     return 1;
                 }
-                i++;
             }
-            else if (arg.compare("--verbose", Qt::CaseSensitive) == 0
-                    || arg.compare("-v", Qt::CaseSensitive) == 0)
+            else if (arg == "--verbose" || arg == "-v")
                 loglevel=2;
-            else if (arg.compare("--quiet", Qt::CaseSensitive) == 0
-                    || arg.compare("-q", Qt::CaseSensitive) == 0)
+            else if (arg == "--quiet" || arg == "-q")
                 loglevel=0;
             else
                 errstream << "unknown command line option " << arg << endl;
         } else {
             exeFile = arg;
-            i++;
-            for(;i<args.size();i++) {
-                cmdLine.append(args.at(i));
+            while(it.hasNext()) {
+                cmdLine.append(it.next());
             }
         }
     }
 
-    if (exeFile.isEmpty() && sisFile.isEmpty()) {
+    if (exeFile.isEmpty() && sisFile.isEmpty() && 
+        (downloadLocalFile.isEmpty() || downloadRemoteFile.isEmpty())) {
         printUsage(outstream, args[0]);
         return 1;
     }
@@ -180,6 +182,10 @@ int main(int argc, char *argv[])
         launcher->setFileName(QString("c:\\sys\\bin\\") + info.fileName());
         launcher->setCommandLineArgs(cmdLine);
     }
+    if (!downloadRemoteFile.isEmpty() && !downloadLocalFile.isEmpty()) {
+        launcher->addStartupActions(trk::Launcher::ActionDownload);
+        launcher->setDownloadFileName(downloadRemoteFile, downloadLocalFile);
+    }
     if (loglevel > 0)
         outstream << "Connecting to target via " << serialPortName << endl;
     launcher->setTrkServerName(serialPortName);
diff --git a/tools/runonphone/symbianutils/launcher.cpp b/tools/runonphone/symbianutils/launcher.cpp
index 92b494a..fa509e7 100644
--- a/tools/runonphone/symbianutils/launcher.cpp
+++ b/tools/runonphone/symbianutils/launcher.cpp
@@ -54,6 +54,8 @@
 #include <QtCore/QFile>
 #include <QtCore/QScopedPointer>
 
+#include <cstdio>
+
 namespace trk {
 
 struct LauncherPrivate {
@@ -62,7 +64,8 @@ struct LauncherPrivate {
         QString destinationFileName;
         uint copyFileHandle;
         QScopedPointer<QByteArray> data;
-        int position;
+        qint64 position;
+        QScopedPointer<QFile> localFile;
     };
 
     explicit LauncherPrivate(const TrkDevicePtr &d);
@@ -76,6 +79,7 @@ struct LauncherPrivate {
     Session m_session; // global-ish data (process id, target information)
 
     CopyState m_copyState;
+    CopyState m_downloadState;
     QString m_fileName;
     QStringList m_commandLineArgs;
     QString m_installFileName;
@@ -158,6 +162,12 @@ void Launcher::setCopyFileName(const QString &srcName, const QString &dstName)
     d->m_copyState.destinationFileName = dstName;
 }
 
+void Launcher::setDownloadFileName(const QString &srcName, const QString &dstName)
+{
+    d->m_downloadState.sourceFileName = srcName;
+    d->m_downloadState.destinationFileName = dstName;
+}
+
 void Launcher::setInstallFileName(const QString &name)
 {
     d->m_installFileName = name;
@@ -193,10 +203,26 @@ bool Launcher::startServer(QString *errorMessage)
 {
     errorMessage->clear();
     if (d->m_verbose) {
-        const QString msg = QString::fromLatin1("Port=%1 Executable=%2 Arguments=%3 Package=%4 Remote Package=%5 Install file=%6")
-                            .arg(trkServerName(), d->m_fileName,
-                                 d->m_commandLineArgs.join(QString(QLatin1Char(' '))),
-                                 d->m_copyState.sourceFileName, d->m_copyState.destinationFileName, d->m_installFileName);
+        QString msg;
+        QTextStream str(&msg);
+        str.setIntegerBase(16);
+        str << "Actions=0x" << d->m_startupActions;
+        str.setIntegerBase(10);
+        str << " Port=" << trkServerName();
+        if (!d->m_fileName.isEmpty())
+            str << " Executable=" << d->m_fileName;
+        if (!d->m_commandLineArgs.isEmpty())
+            str << " Arguments= " << d->m_commandLineArgs.join(QString(QLatin1Char(' ')));
+        if (!d->m_copyState.sourceFileName.isEmpty())
+            str << " Package/Source=" << d->m_copyState.sourceFileName;
+        if (!d->m_copyState.destinationFileName.isEmpty())
+            str << " Remote Package/Destination=" << d->m_copyState.destinationFileName;
+        if (!d->m_downloadState.sourceFileName.isEmpty())
+            str << " Source=" << d->m_downloadState.sourceFileName;
+        if (!d->m_downloadState.destinationFileName.isEmpty())
+            str << " Destination=" << d->m_downloadState.destinationFileName;
+        if (!d->m_installFileName.isEmpty())
+            str << " Install file=" << d->m_installFileName;
         logMessage(msg);
     }
     if (d->m_startupActions & ActionCopy) {
@@ -251,6 +277,8 @@ void Launcher::handleConnect(const TrkResult &result)
         installRemotePackageSilently();
     else if (d->m_startupActions & ActionRun)
         startInferiorIfNeeded();
+    else if (d->m_startupActions & ActionDownload)
+        copyFileFromRemote();
 }
 
 void Launcher::setVerbose(int v)
@@ -416,7 +444,7 @@ void Launcher::handleResult(const TrkResult &result)
             if (itemType == 0 // process
                 && result.data.size() >= 10
                 && d->m_session.pid == extractInt(result.data.data() + 6)) {
-                disconnectTrk();
+                    copyFileFromRemote();
             }
             break;
         }
@@ -471,23 +499,99 @@ void Launcher::handleTrkVersion(const TrkResult &result)
     }
 }
 
+static inline QString msgCannotOpenRemoteFile(const QString &fileName, const QString &message)
+{
+    return Launcher::tr("Cannot open remote file '%1': %2").arg(fileName, message);
+}
+
+static inline QString msgCannotOpenLocalFile(const QString &fileName, const QString &message)
+{
+    return Launcher::tr("Cannot open '%1': %2").arg(fileName, message);
+}
+
 void Launcher::handleFileCreation(const TrkResult &result)
 {
     if (result.errorCode() || result.data.size() < 6) {
-        emit canNotCreateFile(d->m_copyState.destinationFileName, result.errorString());
+        const QString msg = msgCannotOpenRemoteFile(d->m_copyState.destinationFileName, result.errorString());
+        logMessage(msg);
+        emit canNotCreateFile(d->m_copyState.destinationFileName, msg);
         disconnectTrk();
         return;
     }
     const char *data = result.data.data();
     d->m_copyState.copyFileHandle = extractInt(data + 2);
-    QFile file(d->m_copyState.sourceFileName);
-    file.open(QIODevice::ReadOnly);
-    d->m_copyState.data.reset(new QByteArray(file.readAll()));
+    const QString localFileName = d->m_copyState.sourceFileName;
+    QFile file(localFileName);
     d->m_copyState.position = 0;
+    if (!file.open(QIODevice::ReadOnly)) {
+        const QString msg = msgCannotOpenLocalFile(localFileName, file.errorString());
+        logMessage(msg);
+        emit canNotOpenLocalFile(localFileName, msg);
+        closeRemoteFile(true);
+        disconnectTrk();
+        return;
+    }
+    d->m_copyState.data.reset(new QByteArray(file.readAll()));
     file.close();
     continueCopying();
 }
 
+void Launcher::handleFileOpened(const TrkResult &result)
+{
+    if (result.errorCode() || result.data.size() < 6) {
+        const QString msg = msgCannotOpenRemoteFile(d->m_downloadState.sourceFileName, result.errorString());
+        logMessage(msg);
+        emit canNotOpenFile(d->m_downloadState.sourceFileName, msg);
+        disconnectTrk();
+        return;
+    }
+    d->m_downloadState.position = 0;
+    const QString localFileName = d->m_downloadState.destinationFileName;
+    bool opened = false;
+    if (localFileName == QLatin1String("-")) {
+        d->m_downloadState.localFile.reset(new QFile);
+        opened = d->m_downloadState.localFile->open(stdout, QFile::WriteOnly);
+    } else {
+        d->m_downloadState.localFile.reset(new QFile(localFileName));
+        opened = d->m_downloadState.localFile->open(QFile::WriteOnly | QFile::Truncate);
+    }
+    if (!opened) {
+        const QString msg = msgCannotOpenLocalFile(localFileName, d->m_downloadState.localFile->errorString());
+        logMessage(msg);
+        emit canNotOpenLocalFile(localFileName, msg);
+        closeRemoteFile(true);
+        disconnectTrk();
+    }
+    continueReading();
+}
+
+void Launcher::continueReading()
+{
+    QByteArray ba;
+    appendInt(&ba, d->m_downloadState.copyFileHandle, TargetByteOrder);
+    appendShort(&ba, 2048, TargetByteOrder);
+    d->m_device->sendTrkMessage(TrkReadFile, TrkCallback(this, &Launcher::handleRead), ba);
+}
+
+void Launcher::handleRead(const TrkResult &result)
+{
+    if (result.errorCode() || result.data.size() < 4) {
+        d->m_downloadState.localFile->close();
+        closeRemoteFile(true);
+        disconnectTrk();
+    } else {
+        int length = extractShort(result.data.data() + 2);
+        //TRK doesn't tell us the file length, so we need to keep reading until it returns 0 length
+        if (length > 0) {
+            d->m_downloadState.localFile->write(result.data.data() + 4, length);
+            continueReading();
+        } else {
+            closeRemoteFile(true);
+            disconnectTrk();
+        }
+    }
+}
+
 void Launcher::handleCopy(const TrkResult &result)
 {
     if (result.errorCode() || result.data.size() < 4) {
@@ -501,13 +605,14 @@ void Launcher::handleCopy(const TrkResult &result)
 
 void Launcher::continueCopying(uint lastCopiedBlockSize)
 {
-    int size = d->m_copyState.data->length();
+    qint64 size = d->m_copyState.data->length();
     d->m_copyState.position += lastCopiedBlockSize;
     if (size == 0)
         emit copyProgress(100);
     else {
-        int percent = qMin((d->m_copyState.position*100)/size, 100);
-        emit copyProgress(percent);
+        const qint64 hundred = 100;
+        const qint64 percent = qMin( (d->m_copyState.position * hundred) / size, hundred);
+        emit copyProgress(static_cast<int>(percent));
     }
     if (d->m_copyState.position < size) {
         QByteArray ba;
@@ -540,6 +645,8 @@ void Launcher::handleFileCopied(const TrkResult &result)
         installRemotePackageSilently();
     else if (d->m_startupActions & ActionRun)
         startInferiorIfNeeded();
+    else if (d->m_startupActions & ActionDownload)
+        copyFileFromRemote();
     else
         disconnectTrk();
 }
@@ -603,17 +710,18 @@ void Launcher::handleSupportMask(const TrkResult &result)
         return;
     const char *data = result.data.data() + 1;
 
-    QString str = QLatin1String("SUPPORTED: ");
-    for (int i = 0; i < 32; ++i) {
-        //str.append("  [" + formatByte(data[i]) + "]: ");
-        for (int j = 0; j < 8; ++j) {
-            if (data[i] & (1 << j)) {
-                str.append(QString::number(i * 8 + j, 16));
-                str.append(QLatin1Char(' '));
+    if (d->m_verbose > 1) {
+        QString str = QLatin1String("SUPPORTED: ");
+        for (int i = 0; i < 32; ++i) {
+            for (int j = 0; j < 8; ++j) {
+                if (data[i] & (1 << j)) {
+                    str.append(QString::number(i * 8 + j, 16));
+                    str.append(QLatin1Char(' '));
+                }
             }
         }
+        logMessage(str);
     }
-    logMessage(str);
 }
 
 void Launcher::cleanUp()
@@ -677,11 +785,20 @@ void Launcher::copyFileToRemote()
 {
     emit copyingStarted();
     QByteArray ba;
-    ba.append(char(10));
+    ba.append(char(10)); //kDSFileOpenWrite | kDSFileOpenBinary
     appendString(&ba, d->m_copyState.destinationFileName.toLocal8Bit(), TargetByteOrder, false);
     d->m_device->sendTrkMessage(TrkOpenFile, TrkCallback(this, &Launcher::handleFileCreation), ba);
 }
 
+void Launcher::copyFileFromRemote()
+{
+    emit copyingStarted();
+    QByteArray ba;
+    ba.append(char(9)); //kDSFileOpenRead | kDSFileOpenBinary
+    appendString(&ba, d->m_downloadState.sourceFileName.toLocal8Bit(), TargetByteOrder, false);
+    d->m_device->sendTrkMessage(TrkOpenFile, TrkCallback(this, &Launcher::handleFileOpened), ba);
+}
+
 void Launcher::installRemotePackageSilently()
 {
     emit installingStarted();
@@ -702,6 +819,8 @@ void Launcher::handleInstallPackageFinished(const TrkResult &result)
     }
     if (d->m_startupActions & ActionRun) {
         startInferiorIfNeeded();
+    } else if (d->m_startupActions & ActionDownload) {
+        copyFileFromRemote();
     } else {
         disconnectTrk();
     }
diff --git a/tools/runonphone/symbianutils/launcher.h b/tools/runonphone/symbianutils/launcher.h
index c47285c..6db69d0 100644
--- a/tools/runonphone/symbianutils/launcher.h
+++ b/tools/runonphone/symbianutils/launcher.h
@@ -69,6 +69,7 @@ public:
         ActionInstall = 0x2,
         ActionCopyInstall = ActionCopy | ActionInstall,
         ActionRun = 0x4,
+        ActionDownload = 0x8,
         ActionCopyRun = ActionCopy | ActionRun,
         ActionInstallRun = ActionInstall | ActionRun,
         ActionCopyInstallRun = ActionCopy | ActionInstall | ActionRun
@@ -94,6 +95,7 @@ public:
     QString trkServerName() const;
     void setFileName(const QString &name);
     void setCopyFileName(const QString &srcName, const QString &dstName);
+    void setDownloadFileName(const QString &srcName, const QString &dstName);
     void setInstallFileName(const QString &name);
     void setCommandLineArgs(const QStringList &args);
     bool startServer(QString *errorMessage);
@@ -132,6 +134,8 @@ signals:
     void copyingStarted();
     void canNotConnect(const QString &errorMessage);
     void canNotCreateFile(const QString &filename, const QString &errorMessage);
+    void canNotOpenFile(const QString &filename, const QString &errorMessage);
+    void canNotOpenLocalFile(const QString &filename, const QString &errorMessage);
     void canNotWriteFile(const QString &filename, const QString &errorMessage);
     void canNotCloseFile(const QString &filename, const QString &errorMessage);
     void installingStarted();
@@ -164,8 +168,11 @@ private:
     void handleRemoteProcessKilled(const TrkResult &result);
     void handleConnect(const TrkResult &result);
     void handleFileCreation(const TrkResult &result);
+    void handleFileOpened(const TrkResult &result);
     void handleCopy(const TrkResult &result);
+    void handleRead(const TrkResult &result);
     void continueCopying(uint lastCopiedBlockSize = 0);
+    void continueReading();
     void closeRemoteFile(bool failed = false);
     void handleFileCopied(const TrkResult &result);
     void handleInstallPackageFinished(const TrkResult &result);
@@ -177,6 +184,7 @@ private:
     void handleTrkVersion(const TrkResult &result);
 
     void copyFileToRemote();
+    void copyFileFromRemote();
     void installRemotePackageSilently();
     void startInferiorIfNeeded();
     void handleFinished();
diff --git a/tools/runonphone/symbianutils/trkutils.h b/tools/runonphone/symbianutils/trkutils.h
index 3a485c7..553fc7d 100644
--- a/tools/runonphone/symbianutils/trkutils.h
+++ b/tools/runonphone/symbianutils/trkutils.h
@@ -43,6 +43,7 @@
 #define DEBUGGER_TRK_UTILS
 
 #include "symbianutils_global.h"
+
 #include <QtCore/QByteArray>
 #include <QtCore/QHash>
 #include <QtCore/QStringList>
@@ -57,33 +58,81 @@ namespace trk {
 typedef unsigned char byte;
 
 enum Command {
+    //meta commands
     TrkPing = 0x00,
     TrkConnect = 0x01,
     TrkDisconnect = 0x02,
+    TrkReset = 0x03,
     TrkVersions = 0x04,
     TrkSupported = 0x05,
     TrkCpuType = 0x06,
+    TrkConfigTransport = 0x07,
+    TrkVersions2 = 0x08,
     TrkHostVersions = 0x09,
+
+    //state commands
+    TrkReadMemory = 0x10,
+    TrkWriteMemory = 0x11,
+    TrkReadRegisters = 0x12,
+    TrkWriteRegisters = 0x13,
+    TrkFillMemory = 0x14,
+    TrkCopyMemory = 0x15,
+    TrkFlushCache = 0x16,
+
+    //execution commands
     TrkContinue = 0x18,
+    TrkStep = 0x19,
+    TrkStop = 0x1a,
+    TrkSetBreak = 0x1b,
+    TrkClearBreak = 0x1c,
+    TrkDownload = 0x1d,
+    TrkModifyBreakThread = 0x1e,
+
+    //host -> target IO management
+    TrkNotifyFileInput = 0x20,
+    TrkBlockFileIo = 0x21,
+
+    //host -> target os commands
     TrkCreateItem = 0x40,
     TrkDeleteItem = 0x41,
+    TrkReadInfo = 0x42,
+    TrkWriteInfo = 0x43,
 
     TrkWriteFile = 0x48,
+    TrkReadFile = 0x49,
     TrkOpenFile = 0x4a,
     TrkCloseFile = 0x4b,
+    TrkPositionFile = 0x4c,
     TrkInstallFile = 0x4d,
     TrkInstallFile2 = 0x4e,
 
+    TrkPhoneSwVersion = 0x4f,
+    TrkPhoneName = 0x50,
+    TrkVersions3 = 0x51,
+
+    //replies
     TrkNotifyAck = 0x80,
     TrkNotifyNak = 0xff,
+
+    //target -> host notification
     TrkNotifyStopped = 0x90,
     TrkNotifyException = 0x91,
     TrkNotifyInternalError = 0x92,
+    TrkNotifyStopped2 = 0x94,
+
+    //target -> host OS notification
     TrkNotifyCreated = 0xa0,
     TrkNotifyDeleted = 0xa1,
     TrkNotifyProcessorStarted = 0xa2,
     TrkNotifyProcessorStandBy = 0xa6,
-    TrkNotifyProcessorReset = 0xa7
+    TrkNotifyProcessorReset = 0xa7,
+
+    //target -> host support commands (these are defined but not implemented in TRK)
+    TrkDSWriteFile = 0xd0,
+    TrkDSReadFile = 0xd1,
+    TrkDSOpenFile = 0xd2,
+    TrkDSCloseFile = 0xd3,
+    TrkDSPositionFile = 0xd4
 };
 
 inline byte extractByte(const char *data) { return *data; }
@@ -118,7 +167,7 @@ struct SYMBIANUTILS_EXPORT Library
 struct SYMBIANUTILS_EXPORT TrkAppVersion
 {
     TrkAppVersion();
-    void reset();    
+    void reset();
 
     int trkMajor;
     int trkMinor;
diff --git a/translations/designer_fr.ts b/translations/designer_fr.ts
index b3bf4de..bfdbb73 100644
--- a/translations/designer_fr.ts
+++ b/translations/designer_fr.ts
@@ -1166,7 +1166,7 @@
     <message>
         <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="166"/>
         <source>&amp;Pixmap Function</source>
-        <translation>Function de &amp;pixmap</translation>
+        <translation>Fonction de &amp;pixmap</translation>
     </message>
     <message>
         <location filename="../tools/designer/src/components/formeditor/formwindowsettings.ui" line="219"/>