| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| ... | |
| | | | | | | | | |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Shane Kearns
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Shane Kearns
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
.. and move one function around
Reviewed-by: Shane Kearns
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Shane Kearns
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-By: Shane Kearns
|
| | | | | | | | | |
|
| | |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/corelib/kernel/qcore_symbian_p.h
src/network/kernel/qnetworkinterface_symbian.cpp
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Store/Retrieve sockets in the socket manager
Use the shared socket server instance from QtCore
Also, add 4 stub functions for multicast groups (new in master) to fix
link error
Reviewed-by: Markus Goetz
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-By: Markus Goetz
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Taken the unix native socket engine, and converted each call from the posix
version to the symbian version.
There are many TODOs as this is quite incomplete.
Reviewed-By: Markus Goetz
|
| |\ \ \ \ \ \ \ \
| |_|_|_|_|_|/ /
|/| | | | | | | |
|
| | |\ \ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
fix QLocalSocket::isValid() on Windows
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This function always returned false, even if the socket was connected.
Task-number: QTBUG-18204
Reviewed-by: Martin Petersson
|
| |\ \ \ \ \ \ \ \ \
| |/ / / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
src/corelib/thread/qthread_unix.cpp
|
| | |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
Fixed deployment problems with MSVC 2005 and 2008 SP1
QLocalSocket/Win: handle ERROR_ACCESS_DENIED
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
When we're getting an ERROR_ACCESS_DENIED we're setting the socket's
error to QLocalSocket::SocketAccessError.
Task-number: QTBUG-13644
Reviewed-by: ossi
|
| |/ / / / / / / /
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The socket will not close as long as there are bytes left to write.
So by deleting the pipeWriter bytesToTrite will be 0 and the socket
will close directly.
Task-number: QTBUG-14939
Reviewed-by: Joerg Bornemann
|
| | |_|_|_|_|/ /
|/| | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Merge-request: 1132
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |/ / / / / /
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We need to set the state properly after we have been disconnected.
Also fix the HTTP layer, it needs to handle the disconnect
when reading.
Reviewed-by: Peter Hartmann
|
| |\ \ \ \ \ \
| | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (40 commits)
Readded a ';;' that was removed by mistake.
Fixed mkspec detection for Symbian.
Removed javascript-jit from default symbian-gcce build.
QAbstractSocket: Check for socket state on Unbuffered reads
Corrected a mismerge in GCCE link parameters.
QAbstractSocket: Check for engine validity on Unbuffered reads
tst_qnetworkreply: fix the MiniHttpServer.
tst_qnetworkProxyFactory: fix debug output.
Fixed incorrect referral to an include file.
tst_qnetworkreply: getErrors() only ignore warning for the specific test
Check engine existence before increasing reference count
Fixed library casing.
Fix Q_INVOKABLE declared after Q_PROPERTY
tst_qnetworkreply: small improvements
QNAM: Add a warning for misuse of the file backend.
Keep reference count for cached font engines in QTextEngine
QNAM HTTP: Be more strict with HTTP channel state
tst_qnetworkreply: Add a test for broken gzip encoding
QNAM HTTP: Add qWarning() for double-finished() bug
fix documentation typos in isLowSurrogate and requiresSurrogates
...
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
In the Unbuffered QTcpSocket mode the read() call could
go to the socket engine even though we are not connected right now.
Reviewed-by: Peter Hartmann
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Do not call read() if the socket engine is already invalid.
This could happen when using the Unbuffered QTcpSocket mode which
is currently only used inside QNetworkAccessManager.
Reviewed-by: Shane Kearns
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Markus Goetz
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This fixes the tst_qnetworkreply getFromUnreachableIp() test on Windows.
Reviewed-by: Markus Goetz
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Markus Goetz
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Markus Goetz
|
| | | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When the connecting process is in progress we should not enable the
read notifier. This will be done when we are connected. This fixes the
tst_qnetworkreply proxyChange() on Windows.
Reviewed-by: Markus Goetz
|
| |/ / / /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use TCP localsockets on INTEGRITY, and other small INTEGRITY fixes
Merge-request: 1101
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
on win, when used in FD_SET, FD_ISSET, etc., socketDescriptor assumed to be
SOCKET which is unsigned int
Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
sizeof produces signed int result; QT_SOCKOPTLEN_T is int
Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
v.s_addr = 0; does the same
Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| |\ \ \ \
| |/ / /
| | | /
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| | | |
| | |
| | |
| | | |
Reviewed-By: Trust Me
|
| |\ \ \
| |/ /
| | /
| |/
|/|
| |
| |
| |
| |
| | |
Conflicts:
configure
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/image/qpnghandler.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/opengl/qgl_x11egl.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| | |\ |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a regression in 4d0c4b9f09b35d707d437611519d0024f6f87a8c.
Previously the error string was set if the error is not
ERROR_PIPE_NOT_CONNECTED but the commit changed this behaviour to set
the error string if it is ERROR_PIPE_NOT_CONNECTED.
Task-number: QTBUG-13646
Merge-request: 941
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QT-1635
Reviewed-by: Markus Goetz
|
| |\ \ \
| |/ / |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Me no speak americano.
Reviewed-by: Peter Hartmann
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This will be used by QNAM to prevent event loop recursion while
emitting signals that often spin an event loop, e.g.
authenticationRequired() displaying a dialog for the user.
Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
| | | |
| | |
| | |
| | |
| | | |
Merge-request: 891
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | |
| | |
| | |
| | |
| | | |
If getsockopt() returns an address for an interface that doesn't advertise
that it can multicast, don't second guess the OS, just return the iface.
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We need to make sure that we use the right setsockopt level and option
for the multicast TTL and loopback options. Like on UNIX, we need to use
IPPROTO_IPV6 level when joining and leaving a group. Also, we cannot
bind to a multicast address on Windows (but it is possible on UNIX).
work around this by binding to the Any/AnyIPv6 addresses if a multicast
address is passed to bind.
|
| | | |
| | |
| | |
| | |
| | | |
The setsockopt() to join/leave a group should change level depending on
the type of socket/address being used (and not always use IPPROTO_IP).
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This API allows the programmer to set/query the outgoing interface for
multicast packets for the socket. Both functions need an initialized
socket to work.
Autotest updated to test setting each interface in the system as the
multicast interface for IPv4 and IPv6 UDP sockets.
|
| | | |
| | |
| | |
| | |
| | |
| | | |
These are clones of the broadcastsender and broadcastreceiver examples,
modified to use the multicast API. I've made sure that the examples are linked
in the appropriate places as well.
|
