Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

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

1 files changed, 73 insertions, 34 deletions

diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 615a65d3df..39f145956f 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12108,38 +12108,77 @@ EXPORTS
 	_ZN20QGraphicsItemPrivate11setSubFocusEP13QGraphicsItemS1_ @ 12107 NONAME
 	_ZN20QGraphicsItemPrivate13clearSubFocusEP13QGraphicsItemS1_ @ 12108 NONAME
 	_ZN12QLineControl21resetCursorBlinkTimerEv @ 12109 NONAME
-	_ZN14QVolatileImage11paintEngineEv @ 12110 NONAME
-	_ZN14QVolatileImage12ensureFormatEN6QImage6FormatE @ 12111 NONAME
-	_ZN14QVolatileImage15setAlphaChannelERK7QPixmap @ 12112 NONAME
-	_ZN14QVolatileImage4bitsEv @ 12113 NONAME
-	_ZN14QVolatileImage4fillEj @ 12114 NONAME
-	_ZN14QVolatileImage8copyFromEPS_RK5QRect @ 12115 NONAME
-	_ZN14QVolatileImage8imageRefEv @ 12116 NONAME
-	_ZN14QVolatileImageC1EPvS0_ @ 12117 NONAME
-	_ZN14QVolatileImageC1ERK6QImage @ 12118 NONAME
-	_ZN14QVolatileImageC1ERKS_ @ 12119 NONAME
-	_ZN14QVolatileImageC1EiiN6QImage6FormatE @ 12120 NONAME
-	_ZN14QVolatileImageC1Ev @ 12121 NONAME
-	_ZN14QVolatileImageC2EPvS0_ @ 12122 NONAME
-	_ZN14QVolatileImageC2ERK6QImage @ 12123 NONAME
-	_ZN14QVolatileImageC2ERKS_ @ 12124 NONAME
-	_ZN14QVolatileImageC2EiiN6QImage6FormatE @ 12125 NONAME
-	_ZN14QVolatileImageC2Ev @ 12126 NONAME
-	_ZN14QVolatileImageD1Ev @ 12127 NONAME
-	_ZN14QVolatileImageD2Ev @ 12128 NONAME
-	_ZN14QVolatileImageaSERKS_ @ 12129 NONAME
-	_ZNK14QVolatileImage12bytesPerLineEv @ 12130 NONAME
-	_ZNK14QVolatileImage13endDataAccessEb @ 12131 NONAME
-	_ZNK14QVolatileImage15beginDataAccessEv @ 12132 NONAME
-	_ZNK14QVolatileImage15hasAlphaChannelEv @ 12133 NONAME
-	_ZNK14QVolatileImage20duplicateNativeImageEv @ 12134 NONAME
-	_ZNK14QVolatileImage5depthEv @ 12135 NONAME
-	_ZNK14QVolatileImage5widthEv @ 12136 NONAME
-	_ZNK14QVolatileImage6formatEv @ 12137 NONAME
-	_ZNK14QVolatileImage6heightEv @ 12138 NONAME
-	_ZNK14QVolatileImage6isNullEv @ 12139 NONAME
-	_ZNK14QVolatileImage7toImageEv @ 12140 NONAME
-	_ZNK14QVolatileImage9byteCountEv @ 12141 NONAME
-	_ZNK14QVolatileImage9constBitsEv @ 12142 NONAME
-	_ZN15QGraphicsSystem22releaseCachedResourcesEv @ 12143 NONAME
+	_ZN12QTextControl14setDragEnabledEb @ 12110 NONAME
+	_ZN19QTextDocumentLayout10timerEventEP11QTimerEvent @ 12111 NONAME
+	_ZN19QTextDocumentLayout11qt_metacallEN11QMetaObject4CallEiPPv @ 12112 NONAME
+	_ZN19QTextDocumentLayout11qt_metacastEPKc @ 12113 NONAME
+	_ZN19QTextDocumentLayout11setViewportERK6QRectF @ 12114 NONAME
+	_ZN19QTextDocumentLayout13setLineHeightEfNS_14LineHeightModeE @ 12115 NONAME
+	_ZN19QTextDocumentLayout14ensureLayoutedEf @ 12116 NONAME
+	_ZN19QTextDocumentLayout14layoutFinishedEv @ 12117 NONAME
+	_ZN19QTextDocumentLayout14setCursorWidthEi @ 12118 NONAME
+	_ZN19QTextDocumentLayout15documentChangedEiii @ 12119 NONAME
+	_ZN19QTextDocumentLayout16drawInlineObjectEP8QPainterRK6QRectF17QTextInlineObjectiRK11QTextFormat @ 12120 NONAME
+	_ZN19QTextDocumentLayout16staticMetaObjectE @ 12121 NONAME DATA 16
+	_ZN19QTextDocumentLayout18resizeInlineObjectE17QTextInlineObjectiRK11QTextFormat @ 12122 NONAME
+	_ZN19QTextDocumentLayout19getStaticMetaObjectEv @ 12123 NONAME
+	_ZN19QTextDocumentLayout19setFixedColumnWidthEi @ 12124 NONAME
+	_ZN19QTextDocumentLayout20positionInlineObjectE17QTextInlineObjectiRK11QTextFormat @ 12125 NONAME
+	_ZN19QTextDocumentLayout4drawEP8QPainterRKN27QAbstractTextDocumentLayout12PaintContextE @ 12126 NONAME
+	_ZN19QTextDocumentLayout8doLayoutEiii @ 12127 NONAME
+	_ZN19QTextDocumentLayoutC1EP13QTextDocument @ 12128 NONAME
+	_ZN19QTextDocumentLayoutC2EP13QTextDocument @ 12129 NONAME
+	_ZNK12QTextControl13isDragEnabledEv @ 12130 NONAME
+	_ZNK19QTextDocumentLayout10idealWidthEv @ 12131 NONAME
+	_ZNK19QTextDocumentLayout10metaObjectEv @ 12132 NONAME
+	_ZNK19QTextDocumentLayout11cursorWidthEv @ 12133 NONAME
+	_ZNK19QTextDocumentLayout12documentSizeEv @ 12134 NONAME
+	_ZNK19QTextDocumentLayout12layoutStatusEv @ 12135 NONAME
+	_ZNK19QTextDocumentLayout16dynamicPageCountEv @ 12136 NONAME
+	_ZNK19QTextDocumentLayout17blockBoundingRectERK10QTextBlock @ 12137 NONAME
+	_ZNK19QTextDocumentLayout17frameBoundingRectEP10QTextFrame @ 12138 NONAME
+	_ZNK19QTextDocumentLayout19contentHasAlignmentEv @ 12139 NONAME
+	_ZNK19QTextDocumentLayout19dynamicDocumentSizeEv @ 12140 NONAME
+	_ZNK19QTextDocumentLayout7hitTestERK7QPointFN2Qt15HitTestAccuracyE @ 12141 NONAME
+	_ZNK19QTextDocumentLayout9pageCountEv @ 12142 NONAME
+	_ZTI19QTextDocumentLayout @ 12143 NONAME
+	_ZTV19QTextDocumentLayout @ 12144 NONAME
+	_ZN12QTextControl23setWordSelectionEnabledEb @ 12145 NONAME
+	_ZNK12QTextControl22isWordSelectionEnabledEv @ 12146 NONAME
+	_ZN12QLineControl16updateMicroFocusEv @ 12147 NONAME
+	_ZNK14QWidgetPrivate20assignedInputContextEv @ 12148 NONAME
+	_ZN14QVolatileImage11paintEngineEv @ 12149 NONAME
+	_ZN14QVolatileImage12ensureFormatEN6QImage6FormatE @ 12150 NONAME
+	_ZN14QVolatileImage15setAlphaChannelERK7QPixmap @ 12151 NONAME
+	_ZN14QVolatileImage4bitsEv @ 12152 NONAME
+	_ZN14QVolatileImage4fillEj @ 12153 NONAME
+	_ZN14QVolatileImage8copyFromEPS_RK5QRect @ 12154 NONAME
+	_ZN14QVolatileImage8imageRefEv @ 12155 NONAME
+	_ZN14QVolatileImageC1EPvS0_ @ 12156 NONAME
+	_ZN14QVolatileImageC1ERK6QImage @ 12157 NONAME
+	_ZN14QVolatileImageC1ERKS_ @ 12158 NONAME
+	_ZN14QVolatileImageC1EiiN6QImage6FormatE @ 12159 NONAME
+	_ZN14QVolatileImageC1Ev @ 12160 NONAME
+	_ZN14QVolatileImageC2EPvS0_ @ 12161 NONAME
+	_ZN14QVolatileImageC2ERK6QImage @ 12162 NONAME
+	_ZN14QVolatileImageC2ERKS_ @ 12163 NONAME
+	_ZN14QVolatileImageC2EiiN6QImage6FormatE @ 12164 NONAME
+	_ZN14QVolatileImageC2Ev @ 12165 NONAME
+	_ZN14QVolatileImageD1Ev @ 12166 NONAME
+	_ZN14QVolatileImageD2Ev @ 12167 NONAME
+	_ZN14QVolatileImageaSERKS_ @ 12168 NONAME
+	_ZNK14QVolatileImage12bytesPerLineEv @ 12169 NONAME
+	_ZNK14QVolatileImage13endDataAccessEb @ 12170 NONAME
+	_ZNK14QVolatileImage15beginDataAccessEv @ 12171 NONAME
+	_ZNK14QVolatileImage15hasAlphaChannelEv @ 12172 NONAME
+	_ZNK14QVolatileImage20duplicateNativeImageEv @ 12173 NONAME
+	_ZNK14QVolatileImage5depthEv @ 12174 NONAME
+	_ZNK14QVolatileImage5widthEv @ 12175 NONAME
+	_ZNK14QVolatileImage6formatEv @ 12176 NONAME
+	_ZNK14QVolatileImage6heightEv @ 12177 NONAME
+	_ZNK14QVolatileImage6isNullEv @ 12178 NONAME
+	_ZNK14QVolatileImage7toImageEv @ 12179 NONAME
+	_ZNK14QVolatileImage9byteCountEv @ 12180 NONAME
+	_ZNK14QVolatileImage9constBitsEv @ 12181 NONAME
+	_ZN15QGraphicsSystem22releaseCachedResourcesEv @ 12182 NONAME