Merge remote branch 'mainline/4.6' into 4.6

4 files changed, 59 insertions, 13 deletions

diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def
index 49c4361..fe752c8 100644
--- a/src/s60installs/bwins/QtCoreu.def
+++ b/src/s60installs/bwins/QtCoreu.def
@@ -2264,7 +2264,7 @@ EXPORTS
 	?isSequential@QIODevice@@UBE_NXZ @ 2263 NONAME ; bool QIODevice::isSequential(void) const
 	?isSequential@QIODevicePrivate@@QBE_NXZ @ 2264 NONAME ; bool QIODevicePrivate::isSequential(void) const
 	?isSequential@QProcess@@UBE_NXZ @ 2265 NONAME ; bool QProcess::isSequential(void) const
-	?isSignalConnected@QObjectPrivate@@QBE_NH@Z @ 2266 NONAME ; bool QObjectPrivate::isSignalConnected(int) const
+	?isSignalConnected@QObjectPrivate@@QBE_NI@Z @ 2266 NONAME ; bool QObjectPrivate::isSignalConnected(unsigned int) const
 	?isSimpleText@QString@@QBE_NXZ @ 2267 NONAME ; bool QString::isSimpleText(void) const
 	?isSingleShot@QTimer@@QBE_NXZ @ 2268 NONAME ; bool QTimer::isSingleShot(void) const
 	?isSpace@QChar@@QBE_NXZ @ 2269 NONAME ; bool QChar::isSpace(void) const
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index 60df1f5..303c463 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -2503,7 +2503,7 @@ EXPORTS
 	?cacheMode@QMovie@@QAE?AW4CacheMode@1@XZ @ 2502 NONAME ; enum QMovie::CacheMode QMovie::cacheMode(void)
 	?cacheMode@QMovie@@QBE?AW4CacheMode@1@XZ @ 2503 NONAME ; enum QMovie::CacheMode QMovie::cacheMode(void) const
 	?cacheStatistics@QFont@@SAXXZ @ 2504 NONAME ; void QFont::cacheStatistics(void)
-	?cacheType@QTextureGlyphCache@@QBE?AW4Type@QFontEngineGlyphCache@@XZ @ 2505 NONAME ; enum QFontEngineGlyphCache::Type QTextureGlyphCache::cacheType(void) const
+	?cacheType@QTextureGlyphCache@@QBE?AW4Type@QFontEngineGlyphCache@@XZ @ 2505 NONAME ABSENT ; enum QFontEngineGlyphCache::Type QTextureGlyphCache::cacheType(void) const
 	?calcEffectiveOpacity@QGraphicsItemPrivate@@QBEMXZ @ 2506 NONAME ; float QGraphicsItemPrivate::calcEffectiveOpacity(void) const
 	?calculateTabWidth@QTextEngine@@QBE?AUQFixed@@HU2@@Z @ 2507 NONAME ; struct QFixed QTextEngine::calculateTabWidth(int, struct QFixed) const
 	?calendarPopup@QDateTimeEdit@@QBE_NXZ @ 2508 NONAME ; bool QDateTimeEdit::calendarPopup(void) const
@@ -4299,7 +4299,7 @@ EXPORTS
 	?expandingDirections@QSpacerItem@@UBE?AV?$QFlags@W4Orientation@Qt@@@@XZ @ 4298 NONAME ; class QFlags<enum Qt::Orientation> QSpacerItem::expandingDirections(void) const
 	?expandingDirections@QWidgetItem@@UBE?AV?$QFlags@W4Orientation@Qt@@@@XZ @ 4299 NONAME ; class QFlags<enum Qt::Orientation> QWidgetItem::expandingDirections(void) const
 	?expandsOnDoubleClick@QTreeView@@QBE_NXZ @ 4300 NONAME ; bool QTreeView::expandsOnDoubleClick(void) const
-	?expireGlyphCache@QFontEngine@@AAEXXZ @ 4301 NONAME ; void QFontEngine::expireGlyphCache(void)
+	?expireGlyphCache@QFontEngine@@AAEXXZ @ 4301 NONAME ABSENT ; void QFontEngine::expireGlyphCache(void)
 	?extension@QDialog@@QBEPAVQWidget@@XZ @ 4302 NONAME ; class QWidget * QDialog::extension(void) const
 	?extension@QGraphicsEllipseItem@@MBE?AVQVariant@@ABV2@@Z @ 4303 NONAME ; class QVariant QGraphicsEllipseItem::extension(class QVariant const &) const
 	?extension@QGraphicsItem@@MBE?AVQVariant@@ABV2@@Z @ 4304 NONAME ; class QVariant QGraphicsItem::extension(class QVariant const &) const
@@ -4933,8 +4933,8 @@ EXPORTS
 	?globalY@QMouseEvent@@QBEHXZ @ 4932 NONAME ; int QMouseEvent::globalY(void) const
 	?globalY@QTabletEvent@@QBEHXZ @ 4933 NONAME ; int QTabletEvent::globalY(void) const
 	?globalY@QWheelEvent@@QBEHXZ @ 4934 NONAME ; int QWheelEvent::globalY(void) const
-	?glyphCache@QFontEngine@@QBEPAVQFontEngineGlyphCache@@PAXABVQTransform@@@Z @ 4935 NONAME ; class QFontEngineGlyphCache * QFontEngine::glyphCache(void *, class QTransform const &) const
-	?glyphCache@QFontEngine@@QBEPAVQFontEngineGlyphCache@@W4Type@2@ABVQTransform@@@Z @ 4936 NONAME ; class QFontEngineGlyphCache * QFontEngine::glyphCache(enum QFontEngineGlyphCache::Type, class QTransform const &) const
+	?glyphCache@QFontEngine@@QBEPAVQFontEngineGlyphCache@@PAXABVQTransform@@@Z @ 4935 NONAME ABSENT ; class QFontEngineGlyphCache * QFontEngine::glyphCache(void *, class QTransform const &) const
+	?glyphCache@QFontEngine@@QBEPAVQFontEngineGlyphCache@@W4Type@2@ABVQTransform@@@Z @ 4936 NONAME ABSENT ; class QFontEngineGlyphCache * QFontEngine::glyphCache(enum QFontEngineGlyphCache::Type, class QTransform const &) const
 	?glyphCount@QFontEngine@@UBEHXZ @ 4937 NONAME ; int QFontEngine::glyphCount(void) const
 	?glyphMargin@QTextureGlyphCache@@UBEHXZ @ 4938 NONAME ; int QTextureGlyphCache::glyphMargin(void) const
 	?gotFocus@QFocusEvent@@QBE_NXZ @ 4939 NONAME ; bool QFocusEvent::gotFocus(void) const
@@ -9103,7 +9103,7 @@ EXPORTS
 	?setGestureCancelPolicy@QGesture@@QAEXW4GestureCancelPolicy@1@@Z @ 9102 NONAME ; void QGesture::setGestureCancelPolicy(enum QGesture::GestureCancelPolicy)
 	?setGlobalStrut@QApplication@@SAXABVQSize@@@Z @ 9103 NONAME ; void QApplication::setGlobalStrut(class QSize const &)
 	?setGlyphCache@QFontEngine@@QAEXPAXPAVQFontEngineGlyphCache@@@Z @ 9104 NONAME ; void QFontEngine::setGlyphCache(void *, class QFontEngineGlyphCache *)
-	?setGlyphCache@QFontEngine@@QAEXW4Type@QFontEngineGlyphCache@@PAV3@@Z @ 9105 NONAME ; void QFontEngine::setGlyphCache(enum QFontEngineGlyphCache::Type, class QFontEngineGlyphCache *)
+	?setGlyphCache@QFontEngine@@QAEXW4Type@QFontEngineGlyphCache@@PAV3@@Z @ 9105 NONAME ABSENT ; void QFontEngine::setGlyphCache(enum QFontEngineGlyphCache::Type, class QFontEngineGlyphCache *)
 	?setGraphicsEffect@QGraphicsItem@@QAEXPAVQGraphicsEffect@@@Z @ 9106 NONAME ; void QGraphicsItem::setGraphicsEffect(class QGraphicsEffect *)
 	?setGraphicsEffect@QWidget@@QAEXPAVQGraphicsEffect@@@Z @ 9107 NONAME ; void QWidget::setGraphicsEffect(class QGraphicsEffect *)
 	?setGraphicsEffectSource@QGraphicsEffectPrivate@@QAEXPAVQGraphicsEffectSource@@@Z @ 9108 NONAME ; void QGraphicsEffectPrivate::setGraphicsEffectSource(class QGraphicsEffectSource *)
@@ -12522,4 +12522,3 @@ EXPORTS
 	?addCacheData@QVectorPath@@QBEPAUCacheEntry@1@PAVQPaintEngineEx@@PAXP6AX01@Z@Z @ 12521 NONAME ; struct QVectorPath::CacheEntry * QVectorPath::addCacheData(class QPaintEngineEx *, void *, void (*)(class QPaintEngineEx *, void *)) const
 	?makeCacheable@QVectorPath@@QBEXXZ @ 12522 NONAME ; void QVectorPath::makeCacheable(void) const
 	??1QVectorPath@@QAE@XZ @ 12523 NONAME ; QVectorPath::~QVectorPath(void)
-
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 429ca79..b6862e5 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -698,13 +698,13 @@ EXPORTS
 	_ZN11QFontDialogD2Ev @ 697 NONAME
 	_ZN11QFontEngine11boundingBoxEjRK10QTransform @ 698 NONAME
 	_ZN11QFontEngine11grayPaletteEv @ 699 NONAME
-	_ZN11QFontEngine13setGlyphCacheEN21QFontEngineGlyphCache4TypeEPS0_ @ 700 NONAME
+	_ZN11QFontEngine13setGlyphCacheEN21QFontEngineGlyphCache4TypeEPS0_ @ 700 NONAME ABSENT
 	_ZN11QFontEngine13setGlyphCacheEPvP21QFontEngineGlyphCache @ 701 NONAME
 	_ZN11QFontEngine15addGlyphsToPathEPjP11QFixedPointiP12QPainterPath6QFlagsIN9QTextItem10RenderFlagEE @ 702 NONAME
 	_ZN11QFontEngine16addOutlineToPathEffRK12QGlyphLayoutP12QPainterPath6QFlagsIN9QTextItem10RenderFlagEE @ 703 NONAME
 	_ZN11QFontEngine16alphaMapForGlyphEj @ 704 NONAME
 	_ZN11QFontEngine16alphaMapForGlyphEjRK10QTransform @ 705 NONAME
-	_ZN11QFontEngine16expireGlyphCacheEv @ 706 NONAME
+	_ZN11QFontEngine16expireGlyphCacheEv @ 706 NONAME ABSENT
 	_ZN11QFontEngine16getUnscaledGlyphEjP12QPainterPathP15glyph_metrics_t @ 707 NONAME
 	_ZN11QFontEngine16loadKerningPairsE6QFixed @ 708 NONAME
 	_ZN11QFontEngine16tightBoundingBoxERK12QGlyphLayout @ 709 NONAME
@@ -7615,8 +7615,8 @@ EXPORTS
 	_ZNK11QFontDialog11currentFontEv @ 7614 NONAME
 	_ZNK11QFontDialog12selectedFontEv @ 7615 NONAME
 	_ZNK11QFontDialog7optionsEv @ 7616 NONAME
-	_ZNK11QFontEngine10glyphCacheEN21QFontEngineGlyphCache4TypeERK10QTransform @ 7617 NONAME
-	_ZNK11QFontEngine10glyphCacheEPvRK10QTransform @ 7618 NONAME
+	_ZNK11QFontEngine10glyphCacheEN21QFontEngineGlyphCache4TypeERK10QTransform @ 7617 NONAME ABSENT
+	_ZNK11QFontEngine10glyphCacheEPvRK10QTransform @ 7618 NONAME ABSENT
 	_ZNK11QFontEngine10glyphCountEv @ 7619 NONAME
 	_ZNK11QFontEngine10propertiesEv @ 7620 NONAME
 	_ZNK11QFontEngine12getSfntTableEj @ 7621 NONAME
@@ -11741,4 +11741,47 @@ EXPORTS
 	_ZN11QVectorPathD2Ev @ 11740 NONAME
 	_ZNK11QVectorPath12addCacheDataEP14QPaintEngineExPvPFvS1_S2_E @ 11741 NONAME
 	_ZNK20QGraphicsItemPrivate20discardUpdateRequestEbbb @ 11742 NONAME
+	_ZN11QEglContext10extensionsEv @ 11743 NONAME ABSENT
+	_ZN11QEglContext10getDisplayEP12QPaintDevice @ 11744 NONAME ABSENT
+	_ZN11QEglContext10waitClientEv @ 11745 NONAME ABSENT
+	_ZN11QEglContext10waitNativeEv @ 11746 NONAME ABSENT
+	_ZN11QEglContext11doneCurrentEv @ 11747 NONAME ABSENT
+	_ZN11QEglContext11errorStringEi @ 11748 NONAME ABSENT
+	_ZN11QEglContext11makeCurrentEi @ 11749 NONAME ABSENT
+	_ZN11QEglContext11openDisplayEP12QPaintDevice @ 11750 NONAME ABSENT
+	_ZN11QEglContext11swapBuffersEi @ 11751 NONAME ABSENT
+	_ZN11QEglContext12chooseConfigERK14QEglPropertiesN4QEgl16PixelFormatMatchE @ 11752 NONAME ABSENT
+	_ZN11QEglContext12hasExtensionEPKc @ 11753 NONAME ABSENT
+	_ZN11QEglContext13createContextEPS_PK14QEglProperties @ 11754 NONAME ABSENT
+	_ZN11QEglContext13createSurfaceEP12QPaintDevicePK14QEglProperties @ 11755 NONAME ABSENT
+	_ZN11QEglContext14currentContextEN4QEgl3APIE @ 11756 NONAME ABSENT
+	_ZN11QEglContext14defaultDisplayEP12QPaintDevice @ 11757 NONAME ABSENT
+	_ZN11QEglContext14destroySurfaceEi @ 11758 NONAME ABSENT
+	_ZN11QEglContext14dumpAllConfigsEv @ 11759 NONAME ABSENT
+	_ZN11QEglContext15lazyDoneCurrentEv @ 11760 NONAME ABSENT
+	_ZN11QEglContext17setCurrentContextEN4QEgl3APIEPS_ @ 11761 NONAME ABSENT
+	_ZN11QEglContext7destroyEv @ 11762 NONAME ABSENT
+	_ZN11QEglContextC1Ev @ 11763 NONAME ABSENT
+	_ZN11QEglContextC2Ev @ 11764 NONAME ABSENT
+	_ZN11QEglContextD1Ev @ 11765 NONAME ABSENT
+	_ZN11QEglContextD2Ev @ 11766 NONAME ABSENT
+	_ZN14QEglProperties11removeValueEi @ 11767 NONAME ABSENT
+	_ZN14QEglProperties14dumpAllConfigsEv @ 11768 NONAME ABSENT
+	_ZN14QEglProperties14setPixelFormatEN6QImage6FormatE @ 11769 NONAME ABSENT
+	_ZN14QEglProperties17setRenderableTypeEN4QEgl3APIE @ 11770 NONAME ABSENT
+	_ZN14QEglProperties19reduceConfigurationEv @ 11771 NONAME ABSENT
+	_ZN14QEglProperties20setPaintDeviceFormatEP12QPaintDevice @ 11772 NONAME ABSENT
+	_ZN14QEglProperties8setValueEii @ 11773 NONAME ABSENT
+	_ZN14QEglPropertiesC1Ei @ 11774 NONAME ABSENT
+	_ZN14QEglPropertiesC1Ev @ 11775 NONAME ABSENT
+	_ZN14QEglPropertiesC2Ei @ 11776 NONAME ABSENT
+	_ZN14QEglPropertiesC2Ev @ 11777 NONAME ABSENT
+	_ZNK11QEglContext12configAttribEiPi @ 11778 NONAME ABSENT
+	_ZNK11QEglContext16configPropertiesEi @ 11779 NONAME ABSENT
+	_ZNK11QEglContext7isValidEv @ 11780 NONAME ABSENT
+	_ZNK11QEglContext9isCurrentEv @ 11781 NONAME ABSENT
+	_ZNK14QEglProperties5valueEi @ 11782 NONAME ABSENT
+	_ZNK14QEglProperties8toStringEv @ 11783 NONAME ABSENT
+	_ZNK11QFontEngine10glyphCacheEPvN21QFontEngineGlyphCache4TypeERK10QTransform @ 11784 NONAME
+	_ZNK20QGraphicsItemPrivate21effectiveBoundingRectERK6QRectF @ 11785 NONAME
 
diff --git a/src/s60installs/eabi/QtOpenVGu.def b/src/s60installs/eabi/QtOpenVGu.def
index 8458983..7526632 100644
--- a/src/s60installs/eabi/QtOpenVGu.def
+++ b/src/s60installs/eabi/QtOpenVGu.def
@@ -1,8 +1,8 @@
 EXPORTS
 	_Z16qPixmapToVGImageRK7QPixmap @ 1 NONAME
-	_Z20qt_vg_create_contextP12QPaintDevice @ 2 NONAME
+	_Z20qt_vg_create_contextP12QPaintDevice @ 2 NONAME ABSENT
 	_Z20qt_vg_shared_surfacev @ 3 NONAME
-	_Z21qt_vg_destroy_contextP11QEglContext @ 4 NONAME
+	_Z21qt_vg_destroy_contextP11QEglContext @ 4 NONAME ABSENT
 	_Z24qt_vg_image_to_vg_formatN6QImage6FormatE @ 5 NONAME
 	_Z25qt_vg_config_to_vg_formatP11QEglContext @ 6 NONAME
 	_Z25qt_vg_create_paint_enginev @ 7 NONAME
@@ -169,4 +169,8 @@ EXPORTS
 	_ZThn8_NK16QVGWindowSurface6metricEN12QPaintDevice17PaintDeviceMetricE @ 168 NONAME
 	_ZN14QVGPaintEngine10fillRegionERK7QRegionRK6QColorRK5QSize @ 169 NONAME
 	_ZN20QVGCompositionHelper10blitWindowEmRK5QSizeRK5QRectRK6QPointi @ 170 NONAME
+	_Z20qt_vg_create_contextP12QPaintDevicei @ 171 NONAME
+	_Z21qt_vg_destroy_contextP11QEglContexti @ 172 NONAME
+	_ZN13QVGPixmapData22destroyImageAndContextEv @ 173 NONAME
+	_ZN13QVGPixmapData9hibernateEv @ 174 NONAME