diff options
| author | mread <qt-info@nokia.com> | 2009-08-18 15:20:33 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-18 15:20:33 (GMT) |
| commit | a1cfdc273bac90d58754c286810353ccb0be4b2e (patch) | |
| tree | f9421b62177adafe90de70a03231d09103dcb823 | |
| parent | 3803c3984aa5d3993066f3a0cc3218b44ab4eb6c (diff) | |
| parent | 3d6056dfe01116e34a2b47a70fb95e73753ef766 (diff) | |
| download | Qt-a1cfdc273bac90d58754c286810353ccb0be4b2e.zip Qt-a1cfdc273bac90d58754c286810353ccb0be4b2e.tar.gz Qt-a1cfdc273bac90d58754c286810353ccb0be4b2e.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
| -rw-r--r-- | src/gui/kernel/qclipboard_s60.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/qnativesocketengine_p.h | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/gui/kernel/qclipboard_s60.cpp b/src/gui/kernel/qclipboard_s60.cpp index fe3f579..3c14b93 100644 --- a/src/gui/kernel/qclipboard_s60.cpp +++ b/src/gui/kernel/qclipboard_s60.cpp @@ -205,7 +205,6 @@ const QMimeData* QClipboard::mimeData(Mode mode) const QClipboardData *d = clipboardData(); if (d) { - //###fixme when exceptions are added to Qt TRAPD(err,{ RFs fs = d->fsSession(); CClipboard* cb = CClipboard::NewForReadingLC(fs); @@ -232,7 +231,6 @@ void QClipboard::setMimeData(QMimeData* src, Mode mode) QClipboardData *d = clipboardData(); if (d) { - //###fixme when exceptions are added to Qt TRAPD(err,{ RFs fs = d->fsSession(); CClipboard* cb = CClipboard::NewForWritingLC(fs); diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h index 6b1e8c3..b7e5b9a 100644 --- a/src/network/socket/qnativesocketengine_p.h +++ b/src/network/socket/qnativesocketengine_p.h @@ -187,12 +187,6 @@ public: int socketDescriptor; -#if !defined(QT_NO_IPV6) - struct sockaddr_storage aa; -#else - struct sockaddr_in aa; -#endif - QSocketNotifier *readNotifier, *writeNotifier, *exceptNotifier; #ifdef Q_OS_WIN |