diff options
| author | axis <qt-info@nokia.com> | 2009-12-18 10:32:06 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-18 10:32:06 (GMT) |
| commit | 2fb8ea9aa787d59ac16250eade0adfea08f1ca9d (patch) | |
| tree | c274575bb148c9755a901094fc94d4553a84653c /src/s60installs/eabi/QtNetworku.def | |
| parent | ab8508380d6e5875ed871196eb09642380ac1aef (diff) | |
| parent | bf819a04b0c60c64912f72b613c1546d8be7dc50 (diff) | |
| download | Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.zip Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.gz Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
configure
src/gui/text/qfontdatabase_s60.cpp
Diffstat (limited to 'src/s60installs/eabi/QtNetworku.def')
| -rw-r--r-- | src/s60installs/eabi/QtNetworku.def | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def index cde0325..c37c4a0 100644 --- a/src/s60installs/eabi/QtNetworku.def +++ b/src/s60installs/eabi/QtNetworku.def @@ -989,7 +989,8 @@ EXPORTS _ZlsR11QDataStreamRK21QNetworkCacheMetaData @ 988 NONAME _ZrsR11QDataStreamR12QHostAddress @ 989 NONAME _ZrsR11QDataStreamR21QNetworkCacheMetaData @ 990 NONAME - _ZN15QNetworkRequest20setOriginatingObjectEP7QObject @ 991 NONAME - _ZNK15QNetworkRequest17originatingObjectEv @ 992 NONAME - _ZN10QSslSocket12socketOptionEN15QAbstractSocket12SocketOptionE @ 993 NONAME - _ZN10QSslSocket15setSocketOptionEN15QAbstractSocket12SocketOptionERK8QVariant @ 994 NONAME + _ZN10QSslSocket12socketOptionEN15QAbstractSocket12SocketOptionE @ 991 NONAME + _ZN10QSslSocket15setSocketOptionEN15QAbstractSocket12SocketOptionERK8QVariant @ 992 NONAME + _ZN15QNetworkRequest20setOriginatingObjectEP7QObject @ 993 NONAME + _ZNK15QNetworkRequest17originatingObjectEv @ 994 NONAME + |