diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 01:30:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-06 01:30:58 (GMT) |
| commit | f4bb08bc61df49b9e28bb365ea2aa10e056a2862 (patch) | |
| tree | 5b725a4581b29c9661de7267c1a272494c4fd2f4 /src/s60installs | |
| parent | a8ff8e81f7b120e1ecdd434093be075cdd92fb24 (diff) | |
| parent | bbd444559359df3e211fedb28d40b175af778030 (diff) | |
| download | Qt-f4bb08bc61df49b9e28bb365ea2aa10e056a2862.zip Qt-f4bb08bc61df49b9e28bb365ea2aa10e056a2862.tar.gz Qt-f4bb08bc61df49b9e28bb365ea2aa10e056a2862.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Designer: Prevent rich text from being copied into style sheets.
QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction
qdoc: Removed three unused config variables.
qdoc: Cleaned up the application option specification and use.
Doc: Adding GS QML example files
Doc: Images for QML GS
Doc: Editied version of QML GS
Doc: Adding text to GS page
Fix link error when building Bearer application with Qt Mobility
Doc: nesting up orphant pages
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/eabi/QtNetworku.def | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/s60installs/eabi/QtNetworku.def b/src/s60installs/eabi/QtNetworku.def index 6b34a19..2442ee8 100644 --- a/src/s60installs/eabi/QtNetworku.def +++ b/src/s60installs/eabi/QtNetworku.def @@ -1131,7 +1131,7 @@ EXPORTS _ZNK21QNetworkAccessManager13configurationEv @ 1130 NONAME _ZNK21QNetworkAccessManager17networkAccessibleEv @ 1131 NONAME _ZNK21QNetworkAccessManager19activeConfigurationEv @ 1132 NONAME - _ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME ABSENT + _ZNK21QNetworkConfiguration10bearerNameEv @ 1133 NONAME _ZNK21QNetworkConfiguration10identifierEv @ 1134 NONAME _ZNK21QNetworkConfiguration18isRoamingAvailableEv @ 1135 NONAME _ZNK21QNetworkConfiguration4nameEv @ 1136 NONAME |