Merge remote branch 'origin/master' into file-engine-refactor

master's version of conflicting def files picked.

Conflicts:
	src/s60installs/bwins/QtCoreu.def
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/bwins/QtNetworku.def
	src/s60installs/eabi/QtCoreu.def
	src/s60installs/eabi/QtGuiu.def

4 files changed, 203 insertions, 197 deletions

diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def
index 5939010..02e72a1 100644
--- a/src/s60installs/eabi/QtCoreu.def
+++ b/src/s60installs/eabi/QtCoreu.def
@@ -3715,83 +3715,80 @@ EXPORTS
 	_ZN24QAbstractDeclarativeData17objectNameChangedE @ 3714 NONAME DATA 4
 	_ZN23QEventDispatcherSymbian36queueDeferredActiveObjectsCompletionEv @ 3715 NONAME
 	_ZN11QThreadPool11waitForDoneEi @ 3716 NONAME
-	_ZN12QSystemError8toStringEv @ 3717 NONAME
-	_ZN13QSharedMemory12setNativeKeyERK7QString @ 3718 NONAME
-	_ZN13QUnifiedTimer10timerEventEP11QTimerEvent @ 3719 NONAME
-	_ZN13QUnifiedTimer17ensureTimerUpdateEv @ 3720 NONAME
-	_ZN13QUnifiedTimer17registerAnimationEP18QAbstractAnimationb @ 3721 NONAME
-	_ZN13QUnifiedTimer17setTimingIntervalEi @ 3722 NONAME
-	_ZN13QUnifiedTimer19unregisterAnimationEP18QAbstractAnimation @ 3723 NONAME
-	_ZN13QUnifiedTimer20updateAnimationTimerEv @ 3724 NONAME
-	_ZN13QUnifiedTimer20updateAnimationsTimeEv @ 3725 NONAME
-	_ZN13QUnifiedTimer21restartAnimationTimerEv @ 3726 NONAME
-	_ZN13QUnifiedTimer22installAnimationDriverEP16QAnimationDriver @ 3727 NONAME
-	_ZN13QUnifiedTimer24registerRunningAnimationEP18QAbstractAnimation @ 3728 NONAME
-	_ZN13QUnifiedTimer26unregisterRunningAnimationEP18QAbstractAnimation @ 3729 NONAME
-	_ZN13QUnifiedTimer33closestPauseAnimationTimeToFinishEv @ 3730 NONAME
-	_ZN13QUnifiedTimer8instanceEb @ 3731 NONAME
-	_ZN13QUnifiedTimerC1Ev @ 3732 NONAME
-	_ZN13QUnifiedTimerC2Ev @ 3733 NONAME
-	_ZN16QAnimationDriver11qt_metacallEN11QMetaObject4CallEiPPv @ 3734 NONAME
-	_ZN16QAnimationDriver11qt_metacastEPKc @ 3735 NONAME
-	_ZN16QAnimationDriver16staticMetaObjectE @ 3736 NONAME DATA 16
-	_ZN16QAnimationDriver19getStaticMetaObjectEv @ 3737 NONAME
-	_ZN16QAnimationDriver4stopEv @ 3738 NONAME
-	_ZN16QAnimationDriver5startEv @ 3739 NONAME
-	_ZN16QAnimationDriver7advanceEv @ 3740 NONAME
-	_ZN16QAnimationDriver7installEv @ 3741 NONAME
-	_ZN16QAnimationDriverC2EP7QObject @ 3742 NONAME
-	_ZN16QAnimationDriverC2ER23QAnimationDriverPrivateP7QObject @ 3743 NONAME
-	_ZN16QCoreApplicationC1ERiPPci @ 3744 NONAME
-	_ZN16QCoreApplicationC2ERiPPci @ 3745 NONAME
-	_ZN23QCoreApplicationPrivate19app_compile_versionE @ 3746 NONAME DATA 4
-	_ZN23QCoreApplicationPrivateC1ERiPPcj @ 3747 NONAME
-	_ZN23QCoreApplicationPrivateC2ERiPPcj @ 3748 NONAME
-	_ZN6QMutex12lockInternalEv @ 3749 NONAME
-	_ZN6QMutex14unlockInternalEv @ 3750 NONAME
-	_ZN7QObject10disconnectEPKS_RK11QMetaMethodS1_S4_ @ 3751 NONAME
-	_ZN7QObject7connectEPKS_RK11QMetaMethodS1_S4_N2Qt14ConnectionTypeE @ 3752 NONAME
-	_ZN9QFileInfoC1EP16QFileInfoPrivate @ 3753 NONAME
-	_ZN9QFileInfoC2EP16QFileInfoPrivate @ 3754 NONAME
-	_ZNK10QStringRef10startsWithE13QLatin1StringN2Qt15CaseSensitivityE @ 3755 NONAME
-	_ZNK10QStringRef10startsWithE5QCharN2Qt15CaseSensitivityE @ 3756 NONAME
-	_ZNK10QStringRef10startsWithERK7QStringN2Qt15CaseSensitivityE @ 3757 NONAME
-	_ZNK10QStringRef10startsWithERKS_N2Qt15CaseSensitivityE @ 3758 NONAME
-	_ZNK10QStringRef11lastIndexOfE13QLatin1StringiN2Qt15CaseSensitivityE @ 3759 NONAME
-	_ZNK10QStringRef11lastIndexOfE5QChariN2Qt15CaseSensitivityE @ 3760 NONAME
-	_ZNK10QStringRef11lastIndexOfERK7QStringiN2Qt15CaseSensitivityE @ 3761 NONAME
-	_ZNK10QStringRef11lastIndexOfERKS_iN2Qt15CaseSensitivityE @ 3762 NONAME
-	_ZNK10QStringRef11toLocal8BitEv @ 3763 NONAME
-	_ZNK10QStringRef5countE5QCharN2Qt15CaseSensitivityE @ 3764 NONAME
-	_ZNK10QStringRef5countERK7QStringN2Qt15CaseSensitivityE @ 3765 NONAME
-	_ZNK10QStringRef5countERKS_N2Qt15CaseSensitivityE @ 3766 NONAME
-	_ZNK10QStringRef6toUcs4Ev @ 3767 NONAME
-	_ZNK10QStringRef6toUtf8Ev @ 3768 NONAME
-	_ZNK10QStringRef7indexOfE13QLatin1StringiN2Qt15CaseSensitivityE @ 3769 NONAME
-	_ZNK10QStringRef7indexOfE5QChariN2Qt15CaseSensitivityE @ 3770 NONAME
-	_ZNK10QStringRef7indexOfERK7QStringiN2Qt15CaseSensitivityE @ 3771 NONAME
-	_ZNK10QStringRef7indexOfERKS_iN2Qt15CaseSensitivityE @ 3772 NONAME
-	_ZNK10QStringRef7toAsciiEv @ 3773 NONAME
-	_ZNK10QStringRef8endsWithE13QLatin1StringN2Qt15CaseSensitivityE @ 3774 NONAME
-	_ZNK10QStringRef8endsWithE5QCharN2Qt15CaseSensitivityE @ 3775 NONAME
-	_ZNK10QStringRef8endsWithERK7QStringN2Qt15CaseSensitivityE @ 3776 NONAME
-	_ZNK10QStringRef8endsWithERKS_N2Qt15CaseSensitivityE @ 3777 NONAME
-	_ZNK10QStringRef8toLatin1Ev @ 3778 NONAME
-	_ZNK11QMetaObject4castEPK7QObject @ 3779 NONAME
-	_ZNK13QSharedMemory9nativeKeyEv @ 3780 NONAME
-	_ZNK16QAnimationDriver10metaObjectEv @ 3781 NONAME
-	_ZNK16QAnimationDriver9isRunningEv @ 3782 NONAME
-	_ZNK4QUrl11isLocalFileEv @ 3783 NONAME
-	_ZNK7QObject17senderSignalIndexEv @ 3784 NONAME
-	_ZNK7QString10startsWithERK10QStringRefN2Qt15CaseSensitivityE @ 3785 NONAME
-	_ZNK7QString11lastIndexOfERK10QStringRefiN2Qt15CaseSensitivityE @ 3786 NONAME
-	_ZNK7QString5countERK10QStringRefN2Qt15CaseSensitivityE @ 3787 NONAME
-	_ZNK7QString7indexOfERK10QStringRefiN2Qt15CaseSensitivityE @ 3788 NONAME
-	_ZNK7QString8endsWithERK10QStringRefN2Qt15CaseSensitivityE @ 3789 NONAME
-	_ZTI13QUnifiedTimer @ 3790 NONAME
-	_ZTI16QAnimationDriver @ 3791 NONAME
-	_ZTI23QAnimationDriverPrivate @ 3792 NONAME
-	_ZTV13QUnifiedTimer @ 3793 NONAME
-	_ZTV16QAnimationDriver @ 3794 NONAME
-	_ZTV23QAnimationDriverPrivate @ 3795 NONAME
+	_ZN13QSharedMemory12setNativeKeyERK7QString @ 3717 NONAME
+	_ZN13QUnifiedTimer10timerEventEP11QTimerEvent @ 3718 NONAME
+	_ZN13QUnifiedTimer17ensureTimerUpdateEv @ 3719 NONAME
+	_ZN13QUnifiedTimer17registerAnimationEP18QAbstractAnimationb @ 3720 NONAME
+	_ZN13QUnifiedTimer17setTimingIntervalEi @ 3721 NONAME
+	_ZN13QUnifiedTimer19unregisterAnimationEP18QAbstractAnimation @ 3722 NONAME
+	_ZN13QUnifiedTimer20updateAnimationTimerEv @ 3723 NONAME
+	_ZN13QUnifiedTimer20updateAnimationsTimeEv @ 3724 NONAME
+	_ZN13QUnifiedTimer21restartAnimationTimerEv @ 3725 NONAME
+	_ZN13QUnifiedTimer22installAnimationDriverEP16QAnimationDriver @ 3726 NONAME
+	_ZN13QUnifiedTimer24registerRunningAnimationEP18QAbstractAnimation @ 3727 NONAME
+	_ZN13QUnifiedTimer26unregisterRunningAnimationEP18QAbstractAnimation @ 3728 NONAME
+	_ZN13QUnifiedTimer33closestPauseAnimationTimeToFinishEv @ 3729 NONAME
+	_ZN13QUnifiedTimer8instanceEb @ 3730 NONAME
+	_ZN13QUnifiedTimerC1Ev @ 3731 NONAME
+	_ZN13QUnifiedTimerC2Ev @ 3732 NONAME
+	_ZN16QAnimationDriver11qt_metacallEN11QMetaObject4CallEiPPv @ 3733 NONAME
+	_ZN16QAnimationDriver11qt_metacastEPKc @ 3734 NONAME
+	_ZN16QAnimationDriver16staticMetaObjectE @ 3735 NONAME DATA 16
+	_ZN16QAnimationDriver19getStaticMetaObjectEv @ 3736 NONAME
+	_ZN16QAnimationDriver4stopEv @ 3737 NONAME
+	_ZN16QAnimationDriver5startEv @ 3738 NONAME
+	_ZN16QAnimationDriver7advanceEv @ 3739 NONAME
+	_ZN16QAnimationDriver7installEv @ 3740 NONAME
+	_ZN16QAnimationDriverC2EP7QObject @ 3741 NONAME
+	_ZN16QAnimationDriverC2ER23QAnimationDriverPrivateP7QObject @ 3742 NONAME
+	_ZN16QCoreApplicationC1ERiPPci @ 3743 NONAME
+	_ZN16QCoreApplicationC2ERiPPci @ 3744 NONAME
+	_ZN23QCoreApplicationPrivate19app_compile_versionE @ 3745 NONAME DATA 4
+	_ZN23QCoreApplicationPrivateC1ERiPPcj @ 3746 NONAME
+	_ZN23QCoreApplicationPrivateC2ERiPPcj @ 3747 NONAME
+	_ZN6QMutex12lockInternalEv @ 3748 NONAME
+	_ZN6QMutex14unlockInternalEv @ 3749 NONAME
+	_ZN7QObject10disconnectEPKS_RK11QMetaMethodS1_S4_ @ 3750 NONAME
+	_ZN7QObject7connectEPKS_RK11QMetaMethodS1_S4_N2Qt14ConnectionTypeE @ 3751 NONAME
+	_ZNK10QStringRef10startsWithE13QLatin1StringN2Qt15CaseSensitivityE @ 3752 NONAME
+	_ZNK10QStringRef10startsWithE5QCharN2Qt15CaseSensitivityE @ 3753 NONAME
+	_ZNK10QStringRef10startsWithERK7QStringN2Qt15CaseSensitivityE @ 3754 NONAME
+	_ZNK10QStringRef10startsWithERKS_N2Qt15CaseSensitivityE @ 3755 NONAME
+	_ZNK10QStringRef11lastIndexOfE13QLatin1StringiN2Qt15CaseSensitivityE @ 3756 NONAME
+	_ZNK10QStringRef11lastIndexOfE5QChariN2Qt15CaseSensitivityE @ 3757 NONAME
+	_ZNK10QStringRef11lastIndexOfERK7QStringiN2Qt15CaseSensitivityE @ 3758 NONAME
+	_ZNK10QStringRef11lastIndexOfERKS_iN2Qt15CaseSensitivityE @ 3759 NONAME
+	_ZNK10QStringRef11toLocal8BitEv @ 3760 NONAME
+	_ZNK10QStringRef5countE5QCharN2Qt15CaseSensitivityE @ 3761 NONAME
+	_ZNK10QStringRef5countERK7QStringN2Qt15CaseSensitivityE @ 3762 NONAME
+	_ZNK10QStringRef5countERKS_N2Qt15CaseSensitivityE @ 3763 NONAME
+	_ZNK10QStringRef6toUcs4Ev @ 3764 NONAME
+	_ZNK10QStringRef6toUtf8Ev @ 3765 NONAME
+	_ZNK10QStringRef7indexOfE13QLatin1StringiN2Qt15CaseSensitivityE @ 3766 NONAME
+	_ZNK10QStringRef7indexOfE5QChariN2Qt15CaseSensitivityE @ 3767 NONAME
+	_ZNK10QStringRef7indexOfERK7QStringiN2Qt15CaseSensitivityE @ 3768 NONAME
+	_ZNK10QStringRef7indexOfERKS_iN2Qt15CaseSensitivityE @ 3769 NONAME
+	_ZNK10QStringRef7toAsciiEv @ 3770 NONAME
+	_ZNK10QStringRef8endsWithE13QLatin1StringN2Qt15CaseSensitivityE @ 3771 NONAME
+	_ZNK10QStringRef8endsWithE5QCharN2Qt15CaseSensitivityE @ 3772 NONAME
+	_ZNK10QStringRef8endsWithERK7QStringN2Qt15CaseSensitivityE @ 3773 NONAME
+	_ZNK10QStringRef8endsWithERKS_N2Qt15CaseSensitivityE @ 3774 NONAME
+	_ZNK10QStringRef8toLatin1Ev @ 3775 NONAME
+	_ZNK11QMetaObject4castEPK7QObject @ 3776 NONAME
+	_ZNK13QSharedMemory9nativeKeyEv @ 3777 NONAME
+	_ZNK16QAnimationDriver10metaObjectEv @ 3778 NONAME
+	_ZNK16QAnimationDriver9isRunningEv @ 3779 NONAME
+	_ZNK4QUrl11isLocalFileEv @ 3780 NONAME
+	_ZNK7QObject17senderSignalIndexEv @ 3781 NONAME
+	_ZNK7QString10startsWithERK10QStringRefN2Qt15CaseSensitivityE @ 3782 NONAME
+	_ZNK7QString11lastIndexOfERK10QStringRefiN2Qt15CaseSensitivityE @ 3783 NONAME
+	_ZNK7QString5countERK10QStringRefN2Qt15CaseSensitivityE @ 3784 NONAME
+	_ZNK7QString7indexOfERK10QStringRefiN2Qt15CaseSensitivityE @ 3785 NONAME
+	_ZNK7QString8endsWithERK10QStringRefN2Qt15CaseSensitivityE @ 3786 NONAME
+	_ZTI13QUnifiedTimer @ 3787 NONAME
+	_ZTI16QAnimationDriver @ 3788 NONAME
+	_ZTI23QAnimationDriverPrivate @ 3789 NONAME
+	_ZTV13QUnifiedTimer @ 3790 NONAME
+	_ZTV16QAnimationDriver @ 3791 NONAME
+	_ZTV23QAnimationDriverPrivate @ 3792 NONAME
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index b0efab4..bb0bd5a 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -1883,6 +1883,6 @@ EXPORTS
 	_ZThn8_N29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1882 NONAME ABSENT
 	_ZThn8_N29QDeclarativeAbstractAnimationD0Ev @ 1883 NONAME ABSENT
 	_ZThn8_N29QDeclarativeAbstractAnimationD1Ev @ 1884 NONAME ABSENT
-	_ZN23QDeclarativeDebugHelper15enableDebuggingEv @ 1885 NONAME
+	_ZN23QDeclarativeDebugHelper15enableDebuggingEv @ 1885 NONAME ABSENT
 	_ZN27QDeclarativePropertyPrivate7connectEPK7QObjectiS2_iiPi @ 1886 NONAME ABSENT
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index d6fbdd3..703d11b 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12105,7 +12105,7 @@ EXPORTS
 	_ZN15QStaticTextItemD1Ev @ 12104 NONAME
 	_ZN15QStaticTextItemD2Ev @ 12105 NONAME
 	_ZN19QEventDispatcherS6031reactivateDeferredActiveObjectsEv @ 12106 NONAME
-	_Z18qt_addBitmapToPathffPKhiiiP12QPainterPath @ 12107 NONAME
+	_Z18qt_addBitmapToPathffPKhiiiP12QPainterPath @ 12107 NONAME ABSENT
 	_Z22qt_fontdata_from_indexi @ 12108 NONAME
 	_ZN10QBlittable4lockEv @ 12109 NONAME
 	_ZN10QBlittable6unlockEv @ 12110 NONAME
@@ -12113,120 +12113,124 @@ EXPORTS
 	_ZN10QBlittableD0Ev @ 12112 NONAME
 	_ZN10QBlittableD1Ev @ 12113 NONAME
 	_ZN10QBlittableD2Ev @ 12114 NONAME
-	_ZN11QFontEngine16alphaMapForGlyphEj6QFixed @ 12115 NONAME
-	_ZN11QFontEngine16alphaMapForGlyphEj6QFixedRK10QTransform @ 12116 NONAME
-	_ZN11QFontEngine19alphaRGBMapForGlyphEj6QFixediRK10QTransform @ 12117 NONAME
-	_ZN12QInputDialog7getItemEP7QWidgetRK7QStringS4_RK11QStringListibPb6QFlagsIN2Qt10WindowTypeEES9_INSA_15InputMethodHintEE @ 12118 NONAME
-	_ZN12QInputDialog7getTextEP7QWidgetRK7QStringS4_N9QLineEdit8EchoModeES4_Pb6QFlagsIN2Qt10WindowTypeEES8_INS9_15InputMethodHintEE @ 12119 NONAME
-	_ZN14QWindowSurfaceC2EP7QWidgetb @ 12120 NONAME
-	_ZN18QTextureGlyphCache19fillInPendingGlyphsEv @ 12121 NONAME
-	_ZN19QAbstractProxyModel11setItemDataERK11QModelIndexRK4QMapIi8QVariantE @ 12122 NONAME
-	_ZN19QAbstractProxyModel17resetInternalDataEv @ 12123 NONAME
-	_ZN19QAbstractProxyModel4sortEiN2Qt9SortOrderE @ 12124 NONAME
-	_ZN19QAbstractProxyModel9fetchMoreERK11QModelIndex @ 12125 NONAME
-	_ZN19QApplicationPrivateC1ERiPPcN12QApplication4TypeEi @ 12126 NONAME
-	_ZN19QApplicationPrivateC2ERiPPcN12QApplication4TypeEi @ 12127 NONAME
-	_ZN19QBlitterPaintEngine10drawPixmapERK6QRectFRK7QPixmapS2_ @ 12128 NONAME
-	_ZN19QBlitterPaintEngine10penChangedEv @ 12129 NONAME
-	_ZN19QBlitterPaintEngine11drawEllipseERK6QRectF @ 12130 NONAME
-	_ZN19QBlitterPaintEngine12brushChangedEv @ 12131 NONAME
-	_ZN19QBlitterPaintEngine12drawTextItemERK7QPointFRK9QTextItem @ 12132 NONAME
-	_ZN19QBlitterPaintEngine14opacityChangedEv @ 12133 NONAME
-	_ZN19QBlitterPaintEngine16transformChangedEv @ 12134 NONAME
-	_ZN19QBlitterPaintEngine18brushOriginChangedEv @ 12135 NONAME
-	_ZN19QBlitterPaintEngine18clipEnabledChangedEv @ 12136 NONAME
-	_ZN19QBlitterPaintEngine18drawStaticTextItemEP15QStaticTextItem @ 12137 NONAME
-	_ZN19QBlitterPaintEngine18renderHintsChangedEv @ 12138 NONAME
-	_ZN19QBlitterPaintEngine22compositionModeChangedEv @ 12139 NONAME
-	_ZN19QBlitterPaintEngine3endEv @ 12140 NONAME
-	_ZN19QBlitterPaintEngine4clipERK11QVectorPathN2Qt13ClipOperationE @ 12141 NONAME
-	_ZN19QBlitterPaintEngine4clipERK5QRectN2Qt13ClipOperationE @ 12142 NONAME
-	_ZN19QBlitterPaintEngine4clipERK7QRegionN2Qt13ClipOperationE @ 12143 NONAME
-	_ZN19QBlitterPaintEngine4fillERK11QVectorPathRK6QBrush @ 12144 NONAME
-	_ZN19QBlitterPaintEngine5beginEP12QPaintDevice @ 12145 NONAME
-	_ZN19QBlitterPaintEngine6strokeERK11QVectorPathRK4QPen @ 12146 NONAME
-	_ZN19QBlitterPaintEngine8fillRectERK6QRectFRK6QBrush @ 12147 NONAME
-	_ZN19QBlitterPaintEngine8fillRectERK6QRectFRK6QColor @ 12148 NONAME
-	_ZN19QBlitterPaintEngine8setStateEP13QPainterState @ 12149 NONAME
-	_ZN19QBlitterPaintEngine9drawImageERK6QRectFRK6QImageS2_6QFlagsIN2Qt19ImageConversionFlagEE @ 12150 NONAME
-	_ZN19QBlitterPaintEngine9drawRectsEPK5QRecti @ 12151 NONAME
-	_ZN19QBlitterPaintEngine9drawRectsEPK6QRectFi @ 12152 NONAME
-	_ZN19QBlitterPaintEngineC1EP20QBlittablePixmapData @ 12153 NONAME
-	_ZN19QBlitterPaintEngineC2EP20QBlittablePixmapData @ 12154 NONAME
-	_ZN19QBlitterPaintEngineD0Ev @ 12155 NONAME
-	_ZN19QBlitterPaintEngineD1Ev @ 12156 NONAME
-	_ZN19QBlitterPaintEngineD2Ev @ 12157 NONAME
-	_ZN19QGraphicsGridLayout10removeItemEP19QGraphicsLayoutItem @ 12158 NONAME
-	_ZN20QBlittablePixmapData12setBlittableEP10QBlittable @ 12159 NONAME
-	_ZN20QBlittablePixmapData4fillERK6QColor @ 12160 NONAME
-	_ZN20QBlittablePixmapData6bufferEv @ 12161 NONAME
-	_ZN20QBlittablePixmapData6resizeEii @ 12162 NONAME
-	_ZN20QBlittablePixmapData9fromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 12163 NONAME
-	_ZN20QBlittablePixmapDataC2Ev @ 12164 NONAME
-	_ZN20QBlittablePixmapDataD0Ev @ 12165 NONAME
-	_ZN20QBlittablePixmapDataD1Ev @ 12166 NONAME
-	_ZN20QBlittablePixmapDataD2Ev @ 12167 NONAME
-	_ZN20QRasterWindowSurfaceC1EP7QWidgetb @ 12168 NONAME
-	_ZN20QRasterWindowSurfaceC2EP7QWidgetb @ 12169 NONAME
-	_ZN23QImageTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj6QFixed @ 12170 NONAME
-	_ZN6QImage4fillEN2Qt11GlobalColorE @ 12171 NONAME
-	_ZN6QImage4fillERK6QColor @ 12172 NONAME
-	_ZN7QGlyphs12setPositionsERK7QVectorI7QPointFE @ 12173 NONAME
-	_ZN7QGlyphs15setGlyphIndexesERK7QVectorIjE @ 12174 NONAME
-	_ZN7QGlyphs5clearEv @ 12175 NONAME
-	_ZN7QGlyphs6detachEv @ 12176 NONAME
-	_ZN7QGlyphs7setFontERK5QFont @ 12177 NONAME
-	_ZN7QGlyphsC1ERKS_ @ 12178 NONAME
-	_ZN7QGlyphsC1Ev @ 12179 NONAME
-	_ZN7QGlyphsC2ERKS_ @ 12180 NONAME
-	_ZN7QGlyphsC2Ev @ 12181 NONAME
-	_ZN7QGlyphsD1Ev @ 12182 NONAME
-	_ZN7QGlyphsD2Ev @ 12183 NONAME
-	_ZN7QGlyphsaSERKS_ @ 12184 NONAME
-	_ZN7QGlyphspLERKS_ @ 12185 NONAME
-	_ZN8QPainter10drawGlyphsERK7QPointFRK7QGlyphs @ 12186 NONAME
-	_ZNK10QBlittable12capabilitiesEv @ 12187 NONAME
-	_ZNK10QBlittable4sizeEv @ 12188 NONAME
-	_ZNK10QTabWidget14heightForWidthEi @ 12189 NONAME
-	_ZNK11QFontEngine18createExplicitFontEv @ 12190 NONAME
-	_ZNK11QFontEngine26createExplicitFontWithNameERK7QString @ 12191 NONAME
-	_ZNK11QTextLayout6glyphsEv @ 12192 NONAME
-	_ZNK12QFontMetrics10inFontUcs4Ej @ 12193 NONAME
-	_ZNK12QRadioButton15minimumSizeHintEv @ 12194 NONAME
-	_ZNK13QFontMetricsF10inFontUcs4Ej @ 12195 NONAME
-	_ZNK13QTextFragment6glyphsEv @ 12196 NONAME
-	_ZNK14QWidgetPrivate17hasHeightForWidthEv @ 12197 NONAME
-	_ZNK16QFileSystemModel5rmdirERK11QModelIndex @ 12198 NONAME
-	_ZNK18QTextureGlyphCache18textureMapForGlyphEj6QFixed @ 12199 NONAME
-	_ZNK18QTextureGlyphCache20subPixelPositionForXE6QFixed @ 12200 NONAME
-	_ZNK18QTextureGlyphCache30calculateSubPixelPositionCountEj @ 12201 NONAME
-	_ZNK19QAbstractProxyModel11hasChildrenERK11QModelIndex @ 12202 NONAME
-	_ZNK19QAbstractProxyModel12canFetchMoreERK11QModelIndex @ 12203 NONAME
-	_ZNK19QAbstractProxyModel20supportedDropActionsEv @ 12204 NONAME
-	_ZNK19QAbstractProxyModel4spanERK11QModelIndex @ 12205 NONAME
-	_ZNK19QAbstractProxyModel5buddyERK11QModelIndex @ 12206 NONAME
-	_ZNK19QAbstractProxyModel8mimeDataERK5QListI11QModelIndexE @ 12207 NONAME
-	_ZNK19QAbstractProxyModel9mimeTypesEv @ 12208 NONAME
-	_ZNK19QBlitterPaintEngine11createStateEP13QPainterState @ 12209 NONAME
-	_ZNK20QBlittablePixmapData11paintEngineEv @ 12210 NONAME
-	_ZNK20QBlittablePixmapData15hasAlphaChannelEv @ 12211 NONAME
-	_ZNK20QBlittablePixmapData6metricEN12QPaintDevice17PaintDeviceMetricE @ 12212 NONAME
-	_ZNK20QBlittablePixmapData7toImageEv @ 12213 NONAME
-	_ZNK20QBlittablePixmapData9blittableEv @ 12214 NONAME
-	_ZNK7QGlyphs12glyphIndexesEv @ 12215 NONAME
-	_ZNK7QGlyphs4fontEv @ 12216 NONAME
-	_ZNK7QGlyphs9positionsEv @ 12217 NONAME
-	_ZNK7QGlyphseqERKS_ @ 12218 NONAME
-	_ZNK7QGlyphsneERKS_ @ 12219 NONAME
-	_ZNK7QGlyphsplERKS_ @ 12220 NONAME
-	_ZNK8QPainter16clipBoundingRectEv @ 12221 NONAME
-	_ZNK9QCheckBox15minimumSizeHintEv @ 12222 NONAME
-	_ZNK9QTextLine6glyphsEii @ 12223 NONAME
-	_ZTI10QBlittable @ 12224 NONAME
-	_ZTI19QBlitterPaintEngine @ 12225 NONAME
-	_ZTI20QBlittablePixmapData @ 12226 NONAME
-	_ZTV10QBlittable @ 12227 NONAME
-	_ZTV19QBlitterPaintEngine @ 12228 NONAME
-	_ZTV20QBlittablePixmapData @ 12229 NONAME
-	_Zls6QDebugPK13QSymbianEvent @ 12230 NONAME
+	_ZN11QFontEngine19alphaRGBMapForGlyphEj6QFixediRK10QTransform @ 12115 NONAME
+	_ZN12QInputDialog7getItemEP7QWidgetRK7QStringS4_RK11QStringListibPb6QFlagsIN2Qt10WindowTypeEES9_INSA_15InputMethodHintEE @ 12116 NONAME
+	_ZN12QInputDialog7getTextEP7QWidgetRK7QStringS4_N9QLineEdit8EchoModeES4_Pb6QFlagsIN2Qt10WindowTypeEES8_INS9_15InputMethodHintEE @ 12117 NONAME
+	_ZN14QWindowSurfaceC2EP7QWidgetb @ 12118 NONAME
+	_ZN18QTextureGlyphCache19fillInPendingGlyphsEv @ 12119 NONAME
+	_ZN19QAbstractProxyModel11setItemDataERK11QModelIndexRK4QMapIi8QVariantE @ 12120 NONAME
+	_ZN19QAbstractProxyModel17resetInternalDataEv @ 12121 NONAME
+	_ZN19QAbstractProxyModel4sortEiN2Qt9SortOrderE @ 12122 NONAME
+	_ZN19QAbstractProxyModel9fetchMoreERK11QModelIndex @ 12123 NONAME
+	_ZN19QApplicationPrivateC1ERiPPcN12QApplication4TypeEi @ 12124 NONAME
+	_ZN19QApplicationPrivateC2ERiPPcN12QApplication4TypeEi @ 12125 NONAME
+	_ZN19QBlitterPaintEngine10drawPixmapERK6QRectFRK7QPixmapS2_ @ 12126 NONAME
+	_ZN19QBlitterPaintEngine10penChangedEv @ 12127 NONAME
+	_ZN19QBlitterPaintEngine11drawEllipseERK6QRectF @ 12128 NONAME
+	_ZN19QBlitterPaintEngine12brushChangedEv @ 12129 NONAME
+	_ZN19QBlitterPaintEngine12drawTextItemERK7QPointFRK9QTextItem @ 12130 NONAME
+	_ZN19QBlitterPaintEngine14opacityChangedEv @ 12131 NONAME
+	_ZN19QBlitterPaintEngine16transformChangedEv @ 12132 NONAME
+	_ZN19QBlitterPaintEngine18brushOriginChangedEv @ 12133 NONAME
+	_ZN19QBlitterPaintEngine18clipEnabledChangedEv @ 12134 NONAME
+	_ZN19QBlitterPaintEngine18drawStaticTextItemEP15QStaticTextItem @ 12135 NONAME
+	_ZN19QBlitterPaintEngine18renderHintsChangedEv @ 12136 NONAME
+	_ZN19QBlitterPaintEngine22compositionModeChangedEv @ 12137 NONAME
+	_ZN19QBlitterPaintEngine3endEv @ 12138 NONAME
+	_ZN19QBlitterPaintEngine4clipERK11QVectorPathN2Qt13ClipOperationE @ 12139 NONAME
+	_ZN19QBlitterPaintEngine4clipERK5QRectN2Qt13ClipOperationE @ 12140 NONAME
+	_ZN19QBlitterPaintEngine4clipERK7QRegionN2Qt13ClipOperationE @ 12141 NONAME
+	_ZN19QBlitterPaintEngine4fillERK11QVectorPathRK6QBrush @ 12142 NONAME
+	_ZN19QBlitterPaintEngine5beginEP12QPaintDevice @ 12143 NONAME
+	_ZN19QBlitterPaintEngine6strokeERK11QVectorPathRK4QPen @ 12144 NONAME
+	_ZN19QBlitterPaintEngine8fillRectERK6QRectFRK6QBrush @ 12145 NONAME
+	_ZN19QBlitterPaintEngine8fillRectERK6QRectFRK6QColor @ 12146 NONAME
+	_ZN19QBlitterPaintEngine8setStateEP13QPainterState @ 12147 NONAME
+	_ZN19QBlitterPaintEngine9drawImageERK6QRectFRK6QImageS2_6QFlagsIN2Qt19ImageConversionFlagEE @ 12148 NONAME
+	_ZN19QBlitterPaintEngine9drawRectsEPK5QRecti @ 12149 NONAME
+	_ZN19QBlitterPaintEngine9drawRectsEPK6QRectFi @ 12150 NONAME
+	_ZN19QBlitterPaintEngineC1EP20QBlittablePixmapData @ 12151 NONAME
+	_ZN19QBlitterPaintEngineC2EP20QBlittablePixmapData @ 12152 NONAME
+	_ZN19QBlitterPaintEngineD0Ev @ 12153 NONAME
+	_ZN19QBlitterPaintEngineD1Ev @ 12154 NONAME
+	_ZN19QBlitterPaintEngineD2Ev @ 12155 NONAME
+	_ZN19QGraphicsGridLayout10removeItemEP19QGraphicsLayoutItem @ 12156 NONAME
+	_ZN20QBlittablePixmapData12setBlittableEP10QBlittable @ 12157 NONAME
+	_ZN20QBlittablePixmapData4fillERK6QColor @ 12158 NONAME
+	_ZN20QBlittablePixmapData6bufferEv @ 12159 NONAME
+	_ZN20QBlittablePixmapData6resizeEii @ 12160 NONAME
+	_ZN20QBlittablePixmapData9fromImageERK6QImage6QFlagsIN2Qt19ImageConversionFlagEE @ 12161 NONAME
+	_ZN20QBlittablePixmapDataC2Ev @ 12162 NONAME
+	_ZN20QBlittablePixmapDataD0Ev @ 12163 NONAME
+	_ZN20QBlittablePixmapDataD1Ev @ 12164 NONAME
+	_ZN20QBlittablePixmapDataD2Ev @ 12165 NONAME
+	_ZN20QRasterWindowSurfaceC1EP7QWidgetb @ 12166 NONAME
+	_ZN20QRasterWindowSurfaceC2EP7QWidgetb @ 12167 NONAME
+	_ZN23QImageTextureGlyphCache11fillTextureERKN18QTextureGlyphCache5CoordEj6QFixed @ 12168 NONAME
+	_ZN6QImage4fillEN2Qt11GlobalColorE @ 12169 NONAME
+	_ZN6QImage4fillERK6QColor @ 12170 NONAME
+	_ZN7QGlyphs12setPositionsERK7QVectorI7QPointFE @ 12171 NONAME
+	_ZN7QGlyphs15setGlyphIndexesERK7QVectorIjE @ 12172 NONAME
+	_ZN7QGlyphs5clearEv @ 12173 NONAME
+	_ZN7QGlyphs6detachEv @ 12174 NONAME
+	_ZN7QGlyphs7setFontERK5QFont @ 12175 NONAME
+	_ZN7QGlyphsC1ERKS_ @ 12176 NONAME
+	_ZN7QGlyphsC1Ev @ 12177 NONAME
+	_ZN7QGlyphsC2ERKS_ @ 12178 NONAME
+	_ZN7QGlyphsC2Ev @ 12179 NONAME
+	_ZN7QGlyphsD1Ev @ 12180 NONAME
+	_ZN7QGlyphsD2Ev @ 12181 NONAME
+	_ZN7QGlyphsaSERKS_ @ 12182 NONAME
+	_ZN7QGlyphspLERKS_ @ 12183 NONAME
+	_ZN8QPainter10drawGlyphsERK7QPointFRK7QGlyphs @ 12184 NONAME
+	_ZNK10QBlittable12capabilitiesEv @ 12185 NONAME
+	_ZNK10QBlittable4sizeEv @ 12186 NONAME
+	_ZNK10QTabWidget14heightForWidthEi @ 12187 NONAME
+	_ZNK11QFontEngine18createExplicitFontEv @ 12188 NONAME
+	_ZNK11QFontEngine26createExplicitFontWithNameERK7QString @ 12189 NONAME
+	_ZNK11QTextLayout6glyphsEv @ 12190 NONAME
+	_ZNK12QFontMetrics10inFontUcs4Ej @ 12191 NONAME
+	_ZNK12QRadioButton15minimumSizeHintEv @ 12192 NONAME
+	_ZNK13QFontMetricsF10inFontUcs4Ej @ 12193 NONAME
+	_ZNK13QTextFragment6glyphsEv @ 12194 NONAME
+	_ZNK14QWidgetPrivate17hasHeightForWidthEv @ 12195 NONAME
+	_ZNK16QFileSystemModel5rmdirERK11QModelIndex @ 12196 NONAME
+	_ZNK18QTextureGlyphCache18textureMapForGlyphEj6QFixed @ 12197 NONAME
+	_ZNK18QTextureGlyphCache20subPixelPositionForXE6QFixed @ 12198 NONAME
+	_ZNK18QTextureGlyphCache30calculateSubPixelPositionCountEj @ 12199 NONAME
+	_ZNK19QAbstractProxyModel11hasChildrenERK11QModelIndex @ 12200 NONAME
+	_ZNK19QAbstractProxyModel12canFetchMoreERK11QModelIndex @ 12201 NONAME
+	_ZNK19QAbstractProxyModel20supportedDropActionsEv @ 12202 NONAME
+	_ZNK19QAbstractProxyModel4spanERK11QModelIndex @ 12203 NONAME
+	_ZNK19QAbstractProxyModel5buddyERK11QModelIndex @ 12204 NONAME
+	_ZNK19QAbstractProxyModel8mimeDataERK5QListI11QModelIndexE @ 12205 NONAME
+	_ZNK19QAbstractProxyModel9mimeTypesEv @ 12206 NONAME
+	_ZNK19QBlitterPaintEngine11createStateEP13QPainterState @ 12207 NONAME
+	_ZNK20QBlittablePixmapData11paintEngineEv @ 12208 NONAME
+	_ZNK20QBlittablePixmapData15hasAlphaChannelEv @ 12209 NONAME
+	_ZNK20QBlittablePixmapData6metricEN12QPaintDevice17PaintDeviceMetricE @ 12210 NONAME
+	_ZNK20QBlittablePixmapData7toImageEv @ 12211 NONAME
+	_ZNK20QBlittablePixmapData9blittableEv @ 12212 NONAME
+	_ZNK7QGlyphs12glyphIndexesEv @ 12213 NONAME
+	_ZNK7QGlyphs4fontEv @ 12214 NONAME
+	_ZNK7QGlyphs9positionsEv @ 12215 NONAME
+	_ZNK7QGlyphseqERKS_ @ 12216 NONAME
+	_ZNK7QGlyphsneERKS_ @ 12217 NONAME
+	_ZNK7QGlyphsplERKS_ @ 12218 NONAME
+	_ZNK8QPainter16clipBoundingRectEv @ 12219 NONAME
+	_ZNK9QCheckBox15minimumSizeHintEv @ 12220 NONAME
+	_ZNK9QTextLine6glyphsEii @ 12221 NONAME
+	_ZTI10QBlittable @ 12222 NONAME
+	_ZTI19QBlitterPaintEngine @ 12223 NONAME
+	_ZTI20QBlittablePixmapData @ 12224 NONAME
+	_ZTV10QBlittable @ 12225 NONAME
+	_ZTV19QBlitterPaintEngine @ 12226 NONAME
+	_ZTV20QBlittablePixmapData @ 12227 NONAME
+	_Zls6QDebugPK13QSymbianEvent @ 12228 NONAME
+	_ZN13QS60MainAppUi25ProcessCommandParametersLE11TApaCommandR4TBufILi256EERK6TDesC8 @ 12229 NONAME ABSENT
+	_ZN14QFileOpenEventC1ERK5RFile @ 12230 NONAME ABSENT
+	_ZN14QFileOpenEventC2ERK5RFile @ 12231 NONAME ABSENT
+	_ZNK14QFileOpenEvent8openFileER5QFile6QFlagsIN9QIODevice12OpenModeFlagEE @ 12232 NONAME ABSENT
+	_ZN11QFontEngine16alphaMapForGlyphEj6QFixed @ 12233 NONAME
+	_ZN11QFontEngine16alphaMapForGlyphEj6QFixedRK10QTransform @ 12234 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenGLu.def b/src/s60installs/eabi/QtOpenGLu.def
index 7ceade4..c92d99e 100644
--- a/src/s60installs/eabi/QtOpenGLu.def
+++ b/src/s60installs/eabi/QtOpenGLu.def
@@ -702,4 +702,9 @@ EXPORTS
 	_ZeqRK9QGLFormatS1_ @ 701 NONAME
 	_Zls6QDebugRK9QGLFormat @ 702 NONAME
 	_ZneRK9QGLFormatS1_ @ 703 NONAME
+	_ZN16QGLWindowSurface26initializeOffscreenTextureERK5QSize @ 704 NONAME
+	_ZNK20QGLTextureGlyphCache15maxTextureWidthEv @ 705 NONAME
+	_ZNK20QGLTextureGlyphCache16maxTextureHeightEv @ 706 NONAME
+	_ZThn8_NK20QGLTextureGlyphCache15maxTextureWidthEv @ 707 NONAME
+	_ZThn8_NK20QGLTextureGlyphCache16maxTextureHeightEv @ 708 NONAME