diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-06 04:55:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-06 04:55:01 (GMT) |
| commit | 7219ed4ba65b69f4c8829da176cb19684d012d90 (patch) | |
| tree | bc7c764142fa4312a258f1c91a3659686d5abbc1 /src/network | |
| parent | 8b01937c36632fca8774e90d22ce2aaeb2df883d (diff) | |
| parent | 46910068c310460ee18b579a161618ea6a89f50e (diff) | |
| download | Qt-7219ed4ba65b69f4c8829da176cb19684d012d90.zip Qt-7219ed4ba65b69f4c8829da176cb19684d012d90.tar.gz Qt-7219ed4ba65b69f4c8829da176cb19684d012d90.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Silence warning in qvector with MSVC
QStyleSheetStyle: Fix crash that occurs with several instance of QStyleSheetStyle
QStyleSheetStyle: add a way to style the up arrow
QPointer: assert when using QPointer on destroyed QObject
Add missing Q_ENUMS to QAbstractSocket
Fix QMenu rendering in the unified toolbar
Add even more platform info, and make it expandable.
Hide nonfunctional links, and improve html
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/socket/qabstractsocket.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index f610db3..df09b92 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -64,6 +64,7 @@ class QAuthenticator; class Q_NETWORK_EXPORT QAbstractSocket : public QIODevice { Q_OBJECT + Q_ENUMS(SocketType NetworkLayerProtocol SocketError SocketState SocketOption) public: enum SocketType { TcpSocket, |