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

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Update 4.7 def files
  QS60Style: QComboBox displays checkboxes for items

5 files changed, 75 insertions, 25 deletions

diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp
index d28e1d9..4992e34 100644
--- a/src/gui/styles/qs60style.cpp
+++ b/src/gui/styles/qs60style.cpp
@@ -1750,6 +1750,12 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
             }
             const bool enabled = optionMenuItem.state & State_Enabled;
             const bool checkable = optionMenuItem.checkType != QStyleOptionMenuItem::NotCheckable;
+            bool ignoreCheckMark = false;
+
+#ifndef QT_NO_COMBOBOX
+            if (qobject_cast<const QComboBox*>(widget))
+                ignoreCheckMark = true; //ignore the checkmarks provided by the QComboMenuDelegate
+#endif
 
             uint text_flags = Qt::AlignLeading | Qt::TextShowMnemonic | Qt::TextDontClip
                             | Qt::TextSingleLine | Qt::AlignVCenter;
@@ -1787,7 +1793,8 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option,
                     iconRect.translate(-optionCheckBox.rect.width() - vSpacing, 0);
                     optionCheckBox.rect.translate(textRect.width() + iconRect.width(), 0);
                 }
-                drawPrimitive(PE_IndicatorMenuCheckMark, &optionCheckBox, painter, widget);
+                if (!ignoreCheckMark)
+                    drawPrimitive(PE_IndicatorMenuCheckMark, &optionCheckBox, painter, widget);
             }
             //draw icon and/or checkState
             QPixmap pix = menuItem->icon.pixmap(pixelMetric(PM_SmallIconSize),
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def
index 3df0f47..2992cf6 100644
--- a/src/s60installs/bwins/QtDeclarativeu.def
+++ b/src/s60installs/bwins/QtDeclarativeu.def
@@ -862,7 +862,7 @@ EXPORTS
 	?cursorPositionChanged@QDeclarativeTextEdit@@IAEXXZ @ 861 NONAME ; void QDeclarativeTextEdit::cursorPositionChanged(void)
 	?cursorPositionChanged@QDeclarativeTextInput@@IAEXXZ @ 862 NONAME ; void QDeclarativeTextInput::cursorPositionChanged(void)
 	?cursorRect@QDeclarativeTextEdit@@QBE?AVQRect@@XZ @ 863 NONAME ABSENT ; class QRect QDeclarativeTextEdit::cursorRect(void) const
-	?cursorRect@QDeclarativeTextInput@@QBE?AVQRect@@XZ @ 864 NONAME ; class QRect QDeclarativeTextInput::cursorRect(void) const
+	?cursorRect@QDeclarativeTextInput@@QBE?AVQRect@@XZ @ 864 NONAME ABSENT ; class QRect QDeclarativeTextInput::cursorRect(void) const
 	?cursorVisibleChanged@QDeclarativeTextEdit@@IAEX_N@Z @ 865 NONAME ; void QDeclarativeTextEdit::cursorVisibleChanged(bool)
 	?cursorVisibleChanged@QDeclarativeTextInput@@IAEX_N@Z @ 866 NONAME ; void QDeclarativeTextInput::cursorVisibleChanged(bool)
 	?customParser@QDeclarativeType@@QBEPAVQDeclarativeCustomParser@@XZ @ 867 NONAME ; class QDeclarativeCustomParser * QDeclarativeType::customParser(void) const
@@ -2568,10 +2568,10 @@ EXPORTS
 	?setSelectedTextColor@QDeclarativeTextInput@@QAEXABVQColor@@@Z @ 2567 NONAME ; void QDeclarativeTextInput::setSelectedTextColor(class QColor const &)
 	?setSelectionColor@QDeclarativeTextEdit@@QAEXABVQColor@@@Z @ 2568 NONAME ; void QDeclarativeTextEdit::setSelectionColor(class QColor const &)
 	?setSelectionColor@QDeclarativeTextInput@@QAEXABVQColor@@@Z @ 2569 NONAME ; void QDeclarativeTextInput::setSelectionColor(class QColor const &)
-	?setSelectionEnd@QDeclarativeTextEdit@@QAEXH@Z @ 2570 NONAME ; void QDeclarativeTextEdit::setSelectionEnd(int)
-	?setSelectionEnd@QDeclarativeTextInput@@QAEXH@Z @ 2571 NONAME ; void QDeclarativeTextInput::setSelectionEnd(int)
-	?setSelectionStart@QDeclarativeTextEdit@@QAEXH@Z @ 2572 NONAME ; void QDeclarativeTextEdit::setSelectionStart(int)
-	?setSelectionStart@QDeclarativeTextInput@@QAEXH@Z @ 2573 NONAME ; void QDeclarativeTextInput::setSelectionStart(int)
+	?setSelectionEnd@QDeclarativeTextEdit@@QAEXH@Z @ 2570 NONAME ABSENT ; void QDeclarativeTextEdit::setSelectionEnd(int)
+	?setSelectionEnd@QDeclarativeTextInput@@QAEXH@Z @ 2571 NONAME ABSENT ; void QDeclarativeTextInput::setSelectionEnd(int)
+	?setSelectionStart@QDeclarativeTextEdit@@QAEXH@Z @ 2572 NONAME ABSENT ; void QDeclarativeTextEdit::setSelectionStart(int)
+	?setSelectionStart@QDeclarativeTextInput@@QAEXH@Z @ 2573 NONAME ABSENT ; void QDeclarativeTextInput::setSelectionStart(int)
 	?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)
@@ -3891,7 +3891,7 @@ EXPORTS
 	?wrapMode@QDeclarativeTextEdit@@QBE?AW4WrapMode@1@XZ @ 3890 NONAME ; enum QDeclarativeTextEdit::WrapMode QDeclarativeTextEdit::wrapMode(void) const
 	?wrapModeChanged@QDeclarativeText@@IAEXXZ @ 3891 NONAME ; void QDeclarativeText::wrapModeChanged(void)
 	?wrapModeChanged@QDeclarativeTextEdit@@IAEXXZ @ 3892 NONAME ; void QDeclarativeTextEdit::wrapModeChanged(void)
-	?xToPosition@QDeclarativeTextInput@@QAEHH@Z @ 3893 NONAME ; int QDeclarativeTextInput::xToPosition(int)
+	?xToPosition@QDeclarativeTextInput@@QAEHH@Z @ 3893 NONAME ABSENT ; int QDeclarativeTextInput::xToPosition(int)
 	?staticMetaObject@QDeclarativeSmoothedFollow@@2UQMetaObject@@B @ 3894 NONAME ; struct QMetaObject const QDeclarativeSmoothedFollow::staticMetaObject
 	?trUtf8@QDeclarativeCompiler@@SA?AVQString@@PBD0H@Z @ 3895 NONAME ; class QString QDeclarativeCompiler::trUtf8(char const *, char const *, int)
 	?findSignalByName@QDeclarativePropertyPrivate@@SA?AVQMetaMethod@@PBUQMetaObject@@ABVQByteArray@@@Z @ 3896 NONAME ; class QMetaMethod QDeclarativePropertyPrivate::findSignalByName(struct QMetaObject const *, class QByteArray const &)
@@ -4024,10 +4024,10 @@ EXPORTS
 	?restart@QDeclarativeItemPrivate@@SA_JAAVQElapsedTimer@@@Z @ 4023 NONAME ; long long QDeclarativeItemPrivate::restart(class QElapsedTimer &)
 	?get@QDeclarativeXmlListModel@@QBE?AVQScriptValue@@H@Z @ 4024 NONAME ; class QScriptValue QDeclarativeXmlListModel::get(int) const
 	?setScale@QDeclarativeParentChange@@QAEXVQDeclarativeScriptString@@@Z @ 4025 NONAME ; void QDeclarativeParentChange::setScale(class QDeclarativeScriptString)
-	?showInputPanelOnFocusChanged@QDeclarativeTextEdit@@IAEX_N@Z @ 4026 NONAME ; void QDeclarativeTextEdit::showInputPanelOnFocusChanged(bool)
+	?showInputPanelOnFocusChanged@QDeclarativeTextEdit@@IAEX_N@Z @ 4026 NONAME ABSENT ; void QDeclarativeTextEdit::showInputPanelOnFocusChanged(bool)
 	?focusOutEvent@QDeclarativeTextInput@@MAEXPAVQFocusEvent@@@Z @ 4027 NONAME ; void QDeclarativeTextInput::focusOutEvent(class QFocusEvent *)
 	?height@QDeclarativeParentChange@@QBE?AVQDeclarativeScriptString@@XZ @ 4028 NONAME ; class QDeclarativeScriptString QDeclarativeParentChange::height(void) const
-	?showInputPanelOnFocus@QDeclarativeTextEdit@@QBE_NXZ @ 4029 NONAME ; bool QDeclarativeTextEdit::showInputPanelOnFocus(void) const
+	?showInputPanelOnFocus@QDeclarativeTextEdit@@QBE_NXZ @ 4029 NONAME ABSENT ; bool QDeclarativeTextEdit::showInputPanelOnFocus(void) const
 	?errorString@QDeclarativeComponent@@QBE?AVQString@@XZ @ 4030 NONAME ; class QString QDeclarativeComponent::errorString(void) const
 	?elapsed@QDeclarativeItemPrivate@@SA_JAAVQElapsedTimer@@@Z @ 4031 NONAME ; long long QDeclarativeItemPrivate::elapsed(class QElapsedTimer &)
 	?focusInEvent@QDeclarativeTextInput@@MAEXPAVQFocusEvent@@@Z @ 4032 NONAME ; void QDeclarativeTextInput::focusInEvent(class QFocusEvent *)
@@ -4042,15 +4042,15 @@ EXPORTS
 	?errorString@QDeclarativeXmlListModel@@QBE?AVQString@@XZ @ 4041 NONAME ; class QString QDeclarativeXmlListModel::errorString(void) const
 	?consistentTime@QDeclarativeItemPrivate@@2_JA @ 4042 NONAME ; long long QDeclarativeItemPrivate::consistentTime
 	?scale@QDeclarativeParentChange@@QBE?AVQDeclarativeScriptString@@XZ @ 4043 NONAME ; class QDeclarativeScriptString QDeclarativeParentChange::scale(void) const
-	?showInputPanelOnFocus@QDeclarativeTextInput@@QBE_NXZ @ 4044 NONAME ; bool QDeclarativeTextInput::showInputPanelOnFocus(void) const
+	?showInputPanelOnFocus@QDeclarativeTextInput@@QBE_NXZ @ 4044 NONAME ABSENT ; bool QDeclarativeTextInput::showInputPanelOnFocus(void) const
 	?focusInEvent@QDeclarativeTextEdit@@MAEXPAVQFocusEvent@@@Z @ 4045 NONAME ; void QDeclarativeTextEdit::focusInEvent(class QFocusEvent *)
 	?y@QDeclarativeParentChange@@QBE?AVQDeclarativeScriptString@@XZ @ 4046 NONAME ; class QDeclarativeScriptString QDeclarativeParentChange::y(void) const
 	?setY@QDeclarativeParentChange@@QAEXVQDeclarativeScriptString@@@Z @ 4047 NONAME ; void QDeclarativeParentChange::setY(class QDeclarativeScriptString)
-	?setShowInputPanelOnFocus@QDeclarativeTextEdit@@QAEX_N@Z @ 4048 NONAME ; void QDeclarativeTextEdit::setShowInputPanelOnFocus(bool)
+	?setShowInputPanelOnFocus@QDeclarativeTextEdit@@QAEX_N@Z @ 4048 NONAME ABSENT ; void QDeclarativeTextEdit::setShowInputPanelOnFocus(bool)
 	?paintedSizeChanged@QDeclarativeText@@IAEXXZ @ 4049 NONAME ; void QDeclarativeText::paintedSizeChanged(void)
 	?selectByMouseChanged@QDeclarativeTextEdit@@IAEX_N@Z @ 4050 NONAME ; void QDeclarativeTextEdit::selectByMouseChanged(bool)
 	?openSoftwareInputPanel@QDeclarativeTextInput@@QAEXXZ @ 4051 NONAME ; void QDeclarativeTextInput::openSoftwareInputPanel(void)
-	?setShowInputPanelOnFocus@QDeclarativeTextInput@@QAEX_N@Z @ 4052 NONAME ; void QDeclarativeTextInput::setShowInputPanelOnFocus(bool)
+	?setShowInputPanelOnFocus@QDeclarativeTextInput@@QAEX_N@Z @ 4052 NONAME ABSENT ; void QDeclarativeTextInput::setShowInputPanelOnFocus(bool)
 	?boundingRect@QDeclarativePaintedItem@@MBE?AVQRectF@@XZ @ 4053 NONAME ; class QRectF QDeclarativePaintedItem::boundingRect(void) const
 	?closeSoftwareInputPanel@QDeclarativeTextInput@@QAEXXZ @ 4054 NONAME ; void QDeclarativeTextInput::closeSoftwareInputPanel(void)
 	?setWidth@QDeclarativeParentChange@@QAEXVQDeclarativeScriptString@@@Z @ 4055 NONAME ; void QDeclarativeParentChange::setWidth(class QDeclarativeScriptString)
@@ -4067,11 +4067,25 @@ EXPORTS
 	?selectByMouse@QDeclarativeTextEdit@@QBE_NXZ @ 4066 NONAME ; bool QDeclarativeTextEdit::selectByMouse(void) const
 	?setHeight@QDeclarativeParentChange@@QAEXVQDeclarativeScriptString@@@Z @ 4067 NONAME ; void QDeclarativeParentChange::setHeight(class QDeclarativeScriptString)
 	?start@QDeclarativeItemPrivate@@SAXAAVQElapsedTimer@@@Z @ 4068 NONAME ; void QDeclarativeItemPrivate::start(class QElapsedTimer &)
-	?showInputPanelOnFocusChanged@QDeclarativeTextInput@@IAEX_N@Z @ 4069 NONAME ; void QDeclarativeTextInput::showInputPanelOnFocusChanged(bool)
+	?showInputPanelOnFocusChanged@QDeclarativeTextInput@@IAEX_N@Z @ 4069 NONAME ABSENT ; void QDeclarativeTextInput::showInputPanelOnFocusChanged(bool)
 	?x@QDeclarativeParentChange@@QBE?AVQDeclarativeScriptString@@XZ @ 4070 NONAME ; class QDeclarativeScriptString QDeclarativeParentChange::x(void) const
 	?selectByMouseChanged@QDeclarativeTextInput@@IAEX_N@Z @ 4071 NONAME ; void QDeclarativeTextInput::selectByMouseChanged(bool)
 	?width@QDeclarativeParentChange@@QBE?AVQDeclarativeScriptString@@XZ @ 4072 NONAME ; class QDeclarativeScriptString QDeclarativeParentChange::width(void) const
 	?openSoftwareInputPanel@QDeclarativeTextEdit@@QAEXXZ @ 4073 NONAME ; void QDeclarativeTextEdit::openSoftwareInputPanel(void)
 	?cursorRectangleChanged@QDeclarativeTextEdit@@IAEXXZ @ 4074 NONAME ; void QDeclarativeTextEdit::cursorRectangleChanged(void)
 	?cursorRectangle@QDeclarativeTextEdit@@QBE?AVQRect@@XZ @ 4075 NONAME ; class QRect QDeclarativeTextEdit::cursorRectangle(void) const
+	?selectWord@QDeclarativeTextInput@@QAEXXZ @ 4076 NONAME ; void QDeclarativeTextInput::selectWord(void)
+	?positionToRectangle@QDeclarativeTextEdit@@QBE?AVQRectF@@H@Z @ 4077 NONAME ; class QRectF QDeclarativeTextEdit::positionToRectangle(int) const
+	?cursorRectangle@QDeclarativeTextInput@@QBE?AVQRect@@XZ @ 4078 NONAME ; class QRect QDeclarativeTextInput::cursorRectangle(void) const
+	?mouseDoubleClickEvent@QDeclarativeTextInput@@MAEXPAVQGraphicsSceneMouseEvent@@@Z @ 4079 NONAME ; void QDeclarativeTextInput::mouseDoubleClickEvent(class QGraphicsSceneMouseEvent *)
+	?positionAt@QDeclarativeTextEdit@@QBEHHH@Z @ 4080 NONAME ; int QDeclarativeTextEdit::positionAt(int, int) const
+	?cut@QDeclarativeTextEdit@@QAEXXZ @ 4081 NONAME ; void QDeclarativeTextEdit::cut(void)
+	?copy@QDeclarativeTextEdit@@QAEXXZ @ 4082 NONAME ; void QDeclarativeTextEdit::copy(void)
+	?select@QDeclarativeTextEdit@@QAEXHH@Z @ 4083 NONAME ; void QDeclarativeTextEdit::select(int, int)
+	?moveCursorSelection@QDeclarativeTextEdit@@QAEXH@Z @ 4084 NONAME ; void QDeclarativeTextEdit::moveCursorSelection(int)
+	?select@QDeclarativeTextInput@@QAEXHH@Z @ 4085 NONAME ; void QDeclarativeTextInput::select(int, int)
+	?paste@QDeclarativeTextEdit@@QAEXXZ @ 4086 NONAME ; void QDeclarativeTextEdit::paste(void)
+	?positionToRectangle@QDeclarativeTextInput@@QBE?AVQRectF@@H@Z @ 4087 NONAME ; class QRectF QDeclarativeTextInput::positionToRectangle(int) const
+	?positionAt@QDeclarativeTextInput@@QBEHH@Z @ 4088 NONAME ; int QDeclarativeTextInput::positionAt(int) const
+	?selectWord@QDeclarativeTextEdit@@QAEXXZ @ 4089 NONAME ; void QDeclarativeTextEdit::selectWord(void)
 
diff --git a/src/s60installs/bwins/QtGuiu.def b/src/s60installs/bwins/QtGuiu.def
index a1e05e2..9b4ecc2 100644
--- a/src/s60installs/bwins/QtGuiu.def
+++ b/src/s60installs/bwins/QtGuiu.def
@@ -12805,4 +12805,12 @@ EXPORTS
 	?setPerformanceHint@QStaticText@@QAEXW4PerformanceHint@1@@Z @ 12804 NONAME ; void QStaticText::setPerformanceHint(enum QStaticText::PerformanceHint)
 	??0QStaticText@@QAE@ABV0@@Z @ 12805 NONAME ; QStaticText::QStaticText(class QStaticText const &)
 	??0QImageTextureGlyphCache@@QAE@W4Type@QFontEngineGlyphCache@@ABVQTransform@@@Z @ 12806 NONAME ; QImageTextureGlyphCache::QImageTextureGlyphCache(enum QFontEngineGlyphCache::Type, class QTransform const &)
+	?verticalMovementX@QTextCursor@@QBEHXZ @ 12807 NONAME ; int QTextCursor::verticalMovementX(void) const
+	?runtime_graphics_system@QApplicationPrivate@@2_NA @ 12808 NONAME ; bool QApplicationPrivate::runtime_graphics_system
+	?keepPositionOnInsert@QTextCursor@@QBE_NXZ @ 12809 NONAME ; bool QTextCursor::keepPositionOnInsert(void) const
+	?setKeepPositionOnInsert@QTextCursor@@QAEX_N@Z @ 12810 NONAME ; void QTextCursor::setKeepPositionOnInsert(bool)
+	?textDirection@QProgressBar@@QBE?AW4Direction@1@XZ @ 12811 NONAME ; enum QProgressBar::Direction QProgressBar::textDirection(void) const
+	?setVerticalMovementX@QTextCursor@@QAEXH@Z @ 12812 NONAME ; void QTextCursor::setVerticalMovementX(int)
+	?invertedAppearance@QProgressBar@@QBE_NXZ @ 12813 NONAME ; bool QProgressBar::invertedAppearance(void) const
+	?width@QFontMetrics@@QBEHABVQString@@HH@Z @ 12814 NONAME ; int QFontMetrics::width(class QString const &, int, int) const
 
diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def
index 320a780..1c4cd5d 100644
--- a/src/s60installs/eabi/QtDeclarativeu.def
+++ b/src/s60installs/eabi/QtDeclarativeu.def
@@ -911,7 +911,7 @@ EXPORTS
 	_ZN20QDeclarativeTextEdit15mousePressEventEP24QGraphicsSceneMouseEvent @ 910 NONAME
 	_ZN20QDeclarativeTextEdit15readOnlyChangedEb @ 911 NONAME
 	_ZN20QDeclarativeTextEdit15setFocusOnPressEb @ 912 NONAME
-	_ZN20QDeclarativeTextEdit15setSelectionEndEi @ 913 NONAME
+	_ZN20QDeclarativeTextEdit15setSelectionEndEi @ 913 NONAME ABSENT
 	_ZN20QDeclarativeTextEdit16inputMethodEventEP17QInputMethodEvent @ 914 NONAME
 	_ZN20QDeclarativeTextEdit16selectionChangedEv @ 915 NONAME
 	_ZN20QDeclarativeTextEdit16setCursorVisibleEb @ 916 NONAME
@@ -921,7 +921,7 @@ EXPORTS
 	_ZN20QDeclarativeTextEdit17setCursorDelegateEP21QDeclarativeComponent @ 920 NONAME
 	_ZN20QDeclarativeTextEdit17setCursorPositionEi @ 921 NONAME
 	_ZN20QDeclarativeTextEdit17setSelectionColorERK6QColor @ 922 NONAME
-	_ZN20QDeclarativeTextEdit17setSelectionStartEi @ 923 NONAME
+	_ZN20QDeclarativeTextEdit17setSelectionStartEi @ 923 NONAME ABSENT
 	_ZN20QDeclarativeTextEdit17textFormatChangedENS_10TextFormatE @ 924 NONAME
 	_ZN20QDeclarativeTextEdit17textMarginChangedEf @ 925 NONAME
 	_ZN20QDeclarativeTextEdit18loadCursorDelegateEv @ 926 NONAME
@@ -1207,7 +1207,7 @@ EXPORTS
 	_ZN21QDeclarativeTextInput15mousePressEventEP24QGraphicsSceneMouseEvent @ 1206 NONAME
 	_ZN21QDeclarativeTextInput15readOnlyChangedEb @ 1207 NONAME
 	_ZN21QDeclarativeTextInput15setFocusOnPressEb @ 1208 NONAME
-	_ZN21QDeclarativeTextInput15setSelectionEndEi @ 1209 NONAME
+	_ZN21QDeclarativeTextInput15setSelectionEndEi @ 1209 NONAME ABSENT
 	_ZN21QDeclarativeTextInput16cursorPosChangedEv @ 1210 NONAME
 	_ZN21QDeclarativeTextInput16inputMaskChangedERK7QString @ 1211 NONAME
 	_ZN21QDeclarativeTextInput16selectionChangedEv @ 1212 NONAME
@@ -1218,7 +1218,7 @@ EXPORTS
 	_ZN21QDeclarativeTextInput17setCursorDelegateEP21QDeclarativeComponent @ 1217 NONAME
 	_ZN21QDeclarativeTextInput17setCursorPositionEi @ 1218 NONAME
 	_ZN21QDeclarativeTextInput17setSelectionColorERK6QColor @ 1219 NONAME
-	_ZN21QDeclarativeTextInput17setSelectionStartEi @ 1220 NONAME
+	_ZN21QDeclarativeTextInput17setSelectionStartEi @ 1220 NONAME ABSENT
 	_ZN21QDeclarativeTextInput19focusOnPressChangedEb @ 1221 NONAME
 	_ZN21QDeclarativeTextInput19getStaticMetaObjectEv @ 1222 NONAME
 	_ZN21QDeclarativeTextInput19selectedTextChangedEv @ 1223 NONAME
@@ -2627,7 +2627,7 @@ EXPORTS
 	_ZNK21QDeclarativeRectangle8gradientEv @ 2626 NONAME
 	_ZNK21QDeclarativeScaleGrid10metaObjectEv @ 2627 NONAME
 	_ZNK21QDeclarativeScaleGrid6isNullEv @ 2628 NONAME
-	_ZNK21QDeclarativeTextInput10cursorRectEv @ 2629 NONAME
+	_ZNK21QDeclarativeTextInput10cursorRectEv @ 2629 NONAME ABSENT
 	_ZNK21QDeclarativeTextInput10isReadOnlyEv @ 2630 NONAME
 	_ZNK21QDeclarativeTextInput10metaObjectEv @ 2631 NONAME
 	_ZNK21QDeclarativeTextInput12focusOnPressEv @ 2632 NONAME
@@ -3413,7 +3413,7 @@ EXPORTS
 	_ZN20QDeclarativePathView28highlightMoveDurationChangedEv @ 3412 NONAME
 	_ZN20QDeclarativeTextEdit11setWrapModeENS_8WrapModeE @ 3413 NONAME
 	_ZN20QDeclarativeTextEdit15wrapModeChangedEv @ 3414 NONAME
-	_ZN21QDeclarativeTextInput11xToPositionEi @ 3415 NONAME
+	_ZN21QDeclarativeTextInput11xToPositionEi @ 3415 NONAME ABSENT
 	_ZN21QDeclarativeTextInput13setAutoScrollEb @ 3416 NONAME
 	_ZN21QDeclarativeTextInput14mouseMoveEventEP24QGraphicsSceneMouseEvent @ 3417 NONAME
 	_ZN21QDeclarativeTextInput17autoScrollChangedEb @ 3418 NONAME
@@ -3612,16 +3612,16 @@ EXPORTS
 	_ZN20QDeclarativeTextEdit22cursorRectangleChangedEv @ 3611 NONAME
 	_ZN20QDeclarativeTextEdit22openSoftwareInputPanelEv @ 3612 NONAME
 	_ZN20QDeclarativeTextEdit23closeSoftwareInputPanelEv @ 3613 NONAME
-	_ZN20QDeclarativeTextEdit24setShowInputPanelOnFocusEb @ 3614 NONAME
-	_ZN20QDeclarativeTextEdit28showInputPanelOnFocusChangedEb @ 3615 NONAME
+	_ZN20QDeclarativeTextEdit24setShowInputPanelOnFocusEb @ 3614 NONAME ABSENT
+	_ZN20QDeclarativeTextEdit28showInputPanelOnFocusChangedEb @ 3615 NONAME ABSENT
 	_ZN21QDeclarativeTextInput12focusInEventEP11QFocusEvent @ 3616 NONAME
 	_ZN21QDeclarativeTextInput13focusOutEventEP11QFocusEvent @ 3617 NONAME
 	_ZN21QDeclarativeTextInput16setSelectByMouseEb @ 3618 NONAME
 	_ZN21QDeclarativeTextInput20selectByMouseChangedEb @ 3619 NONAME
 	_ZN21QDeclarativeTextInput22openSoftwareInputPanelEv @ 3620 NONAME
 	_ZN21QDeclarativeTextInput23closeSoftwareInputPanelEv @ 3621 NONAME
-	_ZN21QDeclarativeTextInput24setShowInputPanelOnFocusEb @ 3622 NONAME
-	_ZN21QDeclarativeTextInput28showInputPanelOnFocusChangedEb @ 3623 NONAME
+	_ZN21QDeclarativeTextInput24setShowInputPanelOnFocusEb @ 3622 NONAME ABSENT
+	_ZN21QDeclarativeTextInput28showInputPanelOnFocusChangedEb @ 3623 NONAME ABSENT
 	_ZN22QDeclarativeExpressionC1EP19QDeclarativeContextP7QObjectRK7QStringS3_ @ 3624 NONAME
 	_ZN22QDeclarativeExpressionC1EP23QDeclarativeContextDataP7QObjectRK7QString @ 3625 NONAME
 	_ZN22QDeclarativeExpressionC1EP23QDeclarativeContextDataP7QObjectRK7QStringR29QDeclarativeExpressionPrivate @ 3626 NONAME
@@ -3645,10 +3645,10 @@ EXPORTS
 	_ZNK20QDeclarativeTextEdit13paintedHeightEv @ 3644 NONAME
 	_ZNK20QDeclarativeTextEdit13selectByMouseEv @ 3645 NONAME
 	_ZNK20QDeclarativeTextEdit15cursorRectangleEv @ 3646 NONAME
-	_ZNK20QDeclarativeTextEdit21showInputPanelOnFocusEv @ 3647 NONAME
+	_ZNK20QDeclarativeTextEdit21showInputPanelOnFocusEv @ 3647 NONAME ABSENT
 	_ZNK21QDeclarativeComponent11errorStringEv @ 3648 NONAME
 	_ZNK21QDeclarativeTextInput13selectByMouseEv @ 3649 NONAME
-	_ZNK21QDeclarativeTextInput21showInputPanelOnFocusEv @ 3650 NONAME
+	_ZNK21QDeclarativeTextInput21showInputPanelOnFocusEv @ 3650 NONAME ABSENT
 	_ZNK23QDeclarativePaintedItem12boundingRectEv @ 3651 NONAME
 	_ZNK24QDeclarativeXmlListModel11errorStringEv @ 3652 NONAME
 	_ZNK24QDeclarativeXmlListModel3getEi @ 3653 NONAME
@@ -3657,4 +3657,19 @@ EXPORTS
 	_ZThn8_N21QDeclarativeTextInput12focusInEventEP11QFocusEvent @ 3656 NONAME
 	_ZThn8_N21QDeclarativeTextInput13focusOutEventEP11QFocusEvent @ 3657 NONAME
 	_ZThn8_NK23QDeclarativePaintedItem12boundingRectEv @ 3658 NONAME
+	_ZN20QDeclarativeTextEdit10selectWordEv @ 3659 NONAME
+	_ZN20QDeclarativeTextEdit19moveCursorSelectionEi @ 3660 NONAME
+	_ZN20QDeclarativeTextEdit3cutEv @ 3661 NONAME
+	_ZN20QDeclarativeTextEdit4copyEv @ 3662 NONAME
+	_ZN20QDeclarativeTextEdit5pasteEv @ 3663 NONAME
+	_ZN20QDeclarativeTextEdit6selectEii @ 3664 NONAME
+	_ZN21QDeclarativeTextInput10selectWordEv @ 3665 NONAME
+	_ZN21QDeclarativeTextInput21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent @ 3666 NONAME
+	_ZN21QDeclarativeTextInput6selectEii @ 3667 NONAME
+	_ZNK20QDeclarativeTextEdit10positionAtEii @ 3668 NONAME
+	_ZNK20QDeclarativeTextEdit19positionToRectangleEi @ 3669 NONAME
+	_ZNK21QDeclarativeTextInput10positionAtEi @ 3670 NONAME
+	_ZNK21QDeclarativeTextInput15cursorRectangleEv @ 3671 NONAME
+	_ZNK21QDeclarativeTextInput19positionToRectangleEi @ 3672 NONAME
+	_ZThn8_N21QDeclarativeTextInput21mouseDoubleClickEventEP24QGraphicsSceneMouseEvent @ 3673 NONAME
 
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 8aafde9..9c1002d 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12006,4 +12006,10 @@ EXPORTS
 	_ZTV20QGraphicsViewPrivate @ 12005 NONAME
 	_ZTV23QImageTextureGlyphCache @ 12006 NONAME
 	_ZTV26QAbstractScrollAreaPrivate @ 12007 NONAME
+	_ZN11QTextCursor20setVerticalMovementXEi @ 12008 NONAME
+	_ZN11QTextCursor23setKeepPositionOnInsertEb @ 12009 NONAME
+	_ZN19QApplicationPrivate23runtime_graphics_systemE @ 12010 NONAME DATA 1
+	_ZNK11QTextCursor17verticalMovementXEv @ 12011 NONAME
+	_ZNK11QTextCursor20keepPositionOnInsertEv @ 12012 NONAME
+	_ZNK12QFontMetrics5widthERK7QStringii @ 12013 NONAME