diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 11:02:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-05-12 12:48:12 +0200 |
| commit | 6697f2a899fac47a65122a85691b2cfe63c6152c (patch) | |
| tree | 6ae8ad93c7455f9571d1b1b868ae077af89d96df /src/s60installs/eabi/QtNetworku.def | |
| parent | e577d02cc9cba2033cd21c23a4420a1f0d5469a4 (diff) | |
| parent | 1f806aa1b40db276dad359863d018171080d93f9 (diff) | |
Merge remote branch 'origin/master' into refactor
Conflicts:
src/gui/gui.pro
src/gui/painting/painting.pri
src/opengl/opengl.pro
src/openvg/openvg.pro
Diffstat (limited to 'src/s60installs/eabi/QtNetworku.def')
| -rw-r--r-- | src/s60installs/eabi/QtNetworku.def | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def index b0cbb38252..8e29c2de69 100644 --- a/src/s60installs/eabi/QtNetworku.def +++ b/src/s60installs/eabi/QtNetworku.def @@ -1260,4 +1260,12 @@ EXPORTS _ZN4QFtp25staticMetaObjectExtraDataE @ 1259 NONAME DATA 8 _ZN5QHttp18qt_static_metacallEP7QObjectN11QMetaObject4CallEiPPv @ 1260 NONAME _ZN5QHttp25staticMetaObjectExtraDataE @ 1261 NONAME DATA 8 + _ZN18QNetworkProxyQuery23setNetworkConfigurationERK21QNetworkConfiguration @ 1262 NONAME + _ZN18QNetworkProxyQueryC1ERK21QNetworkConfigurationRK4QUrlNS_9QueryTypeE @ 1263 NONAME + _ZN18QNetworkProxyQueryC1ERK21QNetworkConfigurationRK7QStringiS5_NS_9QueryTypeE @ 1264 NONAME + _ZN18QNetworkProxyQueryC1ERK21QNetworkConfigurationtRK7QStringNS_9QueryTypeE @ 1265 NONAME + _ZN18QNetworkProxyQueryC2ERK21QNetworkConfigurationRK4QUrlNS_9QueryTypeE @ 1266 NONAME + _ZN18QNetworkProxyQueryC2ERK21QNetworkConfigurationRK7QStringiS5_NS_9QueryTypeE @ 1267 NONAME + _ZN18QNetworkProxyQueryC2ERK21QNetworkConfigurationtRK7QStringNS_9QueryTypeE @ 1268 NONAME + _ZNK18QNetworkProxyQuery20networkConfigurationEv @ 1269 NONAME |