diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 22:06:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-12 22:06:19 (GMT) |
| commit | ff41e5c637a522ce596a2f1bf5a6d8d242828c27 (patch) | |
| tree | dd29e38211ad426dd9a62c1c78d4ec66b24cc618 /src/s60installs | |
| parent | 0c1e85db7e810e5ac7496dd5fb4c0bd37746be11 (diff) | |
| parent | db2c3c8dc14369e9c2d987916bf10c04567c41d1 (diff) | |
| download | Qt-ff41e5c637a522ce596a2f1bf5a6d8d242828c27.zip Qt-ff41e5c637a522ce596a2f1bf5a6d8d242828c27.tar.gz Qt-ff41e5c637a522ce596a2f1bf5a6d8d242828c27.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: (25 commits)
Update QtDeclarative def files
Update QtCore def files
Compile on MSVC2008
Bug: TextEdit ignores plain text format when pasting text
Update sections if model content changes.
Fix autotest on windows
Test for absent qmldir
Allow objectName to be used in QML bindings
Install the declarative objectNameChanged callback
Don't give focus to a FocusScope that has had focus explicitly cleared.
Add a declarative callback for when a QObject's objectName changes
Ensure GridView header is visible at the top of the view.
Allow aliases to value type properties
Image.sourceSize is incorrect after changing Image.source
Test for QTBUG-13685
Don't forward keys to invisible items.
Disable Text {} image caching by default
Check plugin and QML file case on Mac and Windows
Add test for QTBUG-14279
Ensure that onRelease is called for doubleClick events.
...
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/bwins/QtCoreu.def | 1 | ||||
| -rw-r--r-- | src/s60installs/bwins/QtDeclarativeu.def | 1 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtCoreu.def | 1 | ||||
| -rw-r--r-- | src/s60installs/eabi/QtDeclarativeu.def | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtCoreu.def b/src/s60installs/bwins/QtCoreu.def index 5eeb244..f4e3a28 100644 --- a/src/s60installs/bwins/QtCoreu.def +++ b/src/s60installs/bwins/QtCoreu.def @@ -4483,4 +4483,5 @@ EXPORTS ?msecsSinceReference@QElapsedTimer@@QBE_JXZ @ 4482 NONAME ; long long QElapsedTimer::msecsSinceReference(void) const ?selectThread@QEventDispatcherSymbian@@AAEAAVQSelectThread@@XZ @ 4483 NONAME ; class QSelectThread & QEventDispatcherSymbian::selectThread(void) ?qt_symbian_SetupThreadHeap@@YAHHAAUSStdEpocThreadCreateInfo@@@Z @ 4484 NONAME ; int qt_symbian_SetupThreadHeap(int, struct SStdEpocThreadCreateInfo &) + ?objectNameChanged@QAbstractDeclarativeData@@2P6AXPAV1@PAVQObject@@@ZA @ 4485 NONAME ; void (*QAbstractDeclarativeData::objectNameChanged)(class QAbstractDeclarativeData *, class QObject *) diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def index cf0398a..b72147e 100644 --- a/src/s60installs/bwins/QtDeclarativeu.def +++ b/src/s60installs/bwins/QtDeclarativeu.def @@ -1838,4 +1838,5 @@ EXPORTS ?addChanged@QDeclarativeBasePositioner@@IAEXXZ @ 1837 NONAME ; void QDeclarativeBasePositioner::addChanged(void) ?start@QDeclarativeAbstractAnimation@@QAEXXZ @ 1838 NONAME ; void QDeclarativeAbstractAnimation::start(void) ?qt_metacall@QDeclarativeAbstractAnimation@@UAEHW4Call@QMetaObject@@HPAPAX@Z @ 1839 NONAME ; int QDeclarativeAbstractAnimation::qt_metacall(enum QMetaObject::Call, int, void * *) + ?connect@QDeclarativePropertyPrivate@@SA_NPBVQObject@@H0HHPAH@Z @ 1840 NONAME ; bool QDeclarativePropertyPrivate::connect(class QObject const *, int, class QObject const *, int, int, int *) diff --git a/src/s60installs/eabi/QtCoreu.def b/src/s60installs/eabi/QtCoreu.def index f496839..eb53dca 100644 --- a/src/s60installs/eabi/QtCoreu.def +++ b/src/s60installs/eabi/QtCoreu.def @@ -3712,4 +3712,5 @@ EXPORTS _ZltRK13QElapsedTimerS1_ @ 3711 NONAME _ZrsR11QDataStreamR12QEasingCurve @ 3712 NONAME _Z26qt_symbian_SetupThreadHeapiR24SStdEpocThreadCreateInfo @ 3713 NONAME + _ZN24QAbstractDeclarativeData17objectNameChangedE @ 3714 NONAME DATA 4 diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def index d4084cc..cbfafdc 100644 --- a/src/s60installs/eabi/QtDeclarativeu.def +++ b/src/s60installs/eabi/QtDeclarativeu.def @@ -1883,4 +1883,5 @@ EXPORTS _ZThn8_N29QDeclarativeAbstractAnimation9setTargetERK20QDeclarativeProperty @ 1882 NONAME _ZThn8_N29QDeclarativeAbstractAnimationD0Ev @ 1883 NONAME _ZThn8_N29QDeclarativeAbstractAnimationD1Ev @ 1884 NONAME + _ZN27QDeclarativePropertyPrivate7connectEPK7QObjectiS2_iiPi @ 1885 NONAME |