diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-14 14:53:50 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-14 14:53:50 (GMT) |
commit | 24d1026d4e9a5b9363ba838404d3ec930a236c14 (patch) | |
tree | 93771d60a62a935bec9ff620f6426224f1b521c0 | |
parent | 5878027280de47e8b8fc72a4d0d48f5e5f6dc7db (diff) | |
parent | 9c68bdf3ed66564bce3064a49ca80b7889c35952 (diff) | |
download | Qt-24d1026d4e9a5b9363ba838404d3ec930a236c14.zip Qt-24d1026d4e9a5b9363ba838404d3ec930a236c14.tar.gz Qt-24d1026d4e9a5b9363ba838404d3ec930a236c14.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:
Added symbian defs for e55781212532e2abcdd1cef8548b146fb14f0713
-rw-r--r-- | src/s60installs/bwins/QtDeclarativeu.def | 1 | ||||
-rw-r--r-- | src/s60installs/eabi/QtDeclarativeu.def | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/s60installs/bwins/QtDeclarativeu.def b/src/s60installs/bwins/QtDeclarativeu.def index e96f83f..8fdd72c 100644 --- a/src/s60installs/bwins/QtDeclarativeu.def +++ b/src/s60installs/bwins/QtDeclarativeu.def @@ -1675,4 +1675,5 @@ EXPORTS ?setBindingForObject@QDeclarativeEngineDebug@@QAE_NHABVQString@@ABVQVariant@@_N@Z @ 1674 NONAME ; bool QDeclarativeEngineDebug::setBindingForObject(int, class QString const &, class QVariant const &, bool) ??0QDeclarativeImageProvider@@QAE@W4ImageType@0@@Z @ 1675 NONAME ; QDeclarativeImageProvider::QDeclarativeImageProvider(enum QDeclarativeImageProvider::ImageType) ?setMethodBody@QDeclarativeEngineDebug@@QAE_NHABVQString@@0@Z @ 1676 NONAME ; bool QDeclarativeEngineDebug::setMethodBody(int, class QString const &, class QString const &) + ?resetBindingForObject@QDeclarativeEngineDebug@@QAE_NHABVQString@@@Z @ 1677 NONAME ; bool QDeclarativeEngineDebug::resetBindingForObject(int, class QString const &) diff --git a/src/s60installs/eabi/QtDeclarativeu.def b/src/s60installs/eabi/QtDeclarativeu.def index 083e07f..dd5103f 100644 --- a/src/s60installs/eabi/QtDeclarativeu.def +++ b/src/s60installs/eabi/QtDeclarativeu.def @@ -1706,4 +1706,5 @@ EXPORTS _ZN25QDeclarativeImageProviderC1ENS_9ImageTypeE @ 1705 NONAME _ZN25QDeclarativeImageProviderC2ENS_9ImageTypeE @ 1706 NONAME _ZNK25QDeclarativeImageProvider9imageTypeEv @ 1707 NONAME + _ZN23QDeclarativeEngineDebug21resetBindingForObjectEiRK7QString @ 1708 NONAME |