summaryrefslogtreecommitdiffstats
path: root/src/s60installs/eabi/QtGuiu.def
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-23 08:51:25 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-23 08:51:25 (GMT)
commitbe7edc40324bb135548888853df28bf94eb2aa79 (patch)
tree0ed8e4a9085a2100311530d494acba7385c3eb3a /src/s60installs/eabi/QtGuiu.def
parent3124d14be27766ddf3c86528c913165e09317111 (diff)
parent9df05c922fc0408489cb93ae67e187b717599254 (diff)
downloadQt-be7edc40324bb135548888853df28bf94eb2aa79.zip
Qt-be7edc40324bb135548888853df28bf94eb2aa79.tar.gz
Qt-be7edc40324bb135548888853df28bf94eb2aa79.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (42 commits) Update QtDeclarative def files Fix crash in MouseArea Compile Fixes undeleted timers (and endless warning from the event loop about Remove unneeded member variable. Fix test. Generalize qml "registration" Fix compiler warning Fix TextInput echoMode autotest on Linux Reuse QML lexer to simplify .pragma script logic Fix TextEdit text attribute and text stored in the internal QTextDocument having different contents Remove QDeclarativeItem::childrenChanged() signal overload Update QtGui and QtDeclarative def files Make rootContext and engine pointers in QDeclarativeView API const Add additional QVariant benchmarks. Allow MouseArea dragging to filter mouse events from descendants Expand QDeclarativeExtensionPlugin docs Add missing snippet files Expand QtObject doc Indicate default values ...
Diffstat (limited to 'src/s60installs/eabi/QtGuiu.def')
-rw-r--r--src/s60installs/eabi/QtGuiu.def4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/s60installs/eabi/QtGuiu.def b/src/s60installs/eabi/QtGuiu.def
index 580e173..8c11002 100644
--- a/src/s60installs/eabi/QtGuiu.def
+++ b/src/s60installs/eabi/QtGuiu.def
@@ -12084,4 +12084,8 @@ EXPORTS
_ZThn24_N13QS60MainAppUi15ProcessCommandLEi @ 12083 NONAME
_ZThn40_N13QS60MainAppUi15MopSupplyObjectE8TTypeUid @ 12084 NONAME
_ZThn92_N13QS60MainAppUi22HandleViewDeactivationERK10TVwsViewIdS2_ @ 12085 NONAME
+ _ZN18QTapAndHoldGesture10setTimeoutEi @ 12086 NONAME
+ _ZN18QTapAndHoldGesture7timeoutEv @ 12087 NONAME
+ _ZN20QGraphicsItemPrivate20focusScopeItemChangeEb @ 12088 NONAME
+ _ZN20QGraphicsItemPrivate26childrenBoundingRectHelperEP10QTransformP6QRectFb @ 12089 NONAME