diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-13 11:42:54 (GMT) |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-13 11:42:54 (GMT) |
commit | 3286c4d489905d27183a9ba18048c11a5af8913c (patch) | |
tree | 392cc7137ffd69b305272f672db55a73be4f1dae /src/s60installs/eabi/QtNetworku.def | |
parent | 1bc1e5c0b76a92594c5254e72d25165879e753d2 (diff) | |
parent | 6b651e5f69b656c6c6fa05b6a81674a4fd56a160 (diff) | |
download | Qt-3286c4d489905d27183a9ba18048c11a5af8913c.zip Qt-3286c4d489905d27183a9ba18048c11a5af8913c.tar.gz Qt-3286c4d489905d27183a9ba18048c11a5af8913c.tar.bz2 |
Merge remote branch 'mainline/4.6' into 4.6
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 + |