| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/phonon/qt7/mediaobject.mm
src/3rdparty/phonon/qt7/quicktimevideoplayer.mm
src/gui/text/qfontengine_win.cpp
tools/linguist/shared/cpp.cpp
|
| | |
| |
| |
| |
| |
| |
| | |
This was a contribution sent via the public bugs channel.
Task-number: 255161
Reviewed-by: Marius Storm-Olsen
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| | |
otherwise PeekNamedPipe() may block in threaded environments.
Reviewed-by: thiago
|
| | |
| |
| |
| |
| | |
used character operations whenever possible
better usage of QLatin1String
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
to the socket connection. (Reviewed - see below.)
Also included corrections to the description of how to send SocketError
and SocketState values via signals. (Trust me - as part of an earlier
revision of the custom types documentation.)
Task-number: 222907
Reviewed-by: Andy Shaw
|
| |\ \
| |/
| |
| |
| | |
Conflicts:
src/corelib/kernel/qsharedmemory_unix.cpp
|
| | |
| |
| |
| |
| |
| |
| | |
On Windows, QT_NO_IPV6 isn't defined, but the necessary includes were
missing. So #include winsock2.h and also use our own structures.
Reviewed-By: Trust Me
|
| | |
| |
| |
| |
| | |
Task-number: 254333
Reviewed-by: Andy Shaw <qt-info@nokia.com>
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
This case it was possible to fix by using a union of the types when we
actually declare the variable.
Besides, this avoids a bunch of #ifdef for IPv6 functionality.
Reviewed-By: Oswald Buddenhagen
|
| |\ \
| |/ |
|
| | |
| |
| |
| |
| |
| | |
Usually, "the the" is not proper English
Reviewed-By: Thiago Macieira
|
| | |
| |
| |
| |
| |
| |
| | |
When QT_LOCALSOCKET_TCP is defined we cannot call setEnabled on the
socket notifier.
Reviewed-by: ossi
|
| | | |
|
| |/
|
|
|
|
|
| |
this makes it much less arcane and buggy, specifically it resolves the
internal thread-unsafety.
Reviewed-by: thiago
|
| |
|
|
| |
Reviewed-by: thiago
|
| |
|
|
|
|
|
|
|
| |
about the only error case for a PeekNamedPipe() which does not actually
want to read anything is some kind of disconnect. so ignore the error
code and just handle the error as a close.
Task-number: 247144
Reviewed-by: thiago
|
| |
|
|
|
|
|
|
|
|
| |
QProcessPrivate and QNativeSocketEnginePrivate were reporting a wrong
number of bytes available on 64-bit machines, due to use of size_t in
ioctl. That was required by Irix, which we dropped support for, so we
can also drop size_t
Reviewed-by: Thiago
Task-number: 249537
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
Right now, we print this warning if connectToHost() is called when
we're in ConnectingState (waiting for remote to SYN,ACK) or in
ConnectedState. This also means connectToHost() allows interruption of
the HostLookupState cleanly (I think).
But if you called connectToHost() right after disconnectFromHost() and
there were data to write, the connectToHost() could discard the
pending outgoing data and reconnect. Or not, depending on whether the
DNS resolution ended first. In other words, race condition.
Reviewed-by: Peter Hartmann
|
| |
|
|
|
|
|
|
| |
emit disconnected() if we were in ConnectedState or in ClosingState
before
Reviewed-by: Thiago
Task-number: 250976
|
| |
|
|
|
|
|
|
|
|
| |
When the connection is established, the socket notifier is deleted,
but not the connection timer, so the opened connection will be closed
after 30 seconds.
Task-number: none
Reviewed-by: Andreas
Reviewed-by: Thiago
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
interrupted twice by a signal.
If we're interrupted only once, there's no problem. If we're
interrupted twice, we subtract the elapsed time since the beginning
from the remaining time, so this won't work. The correct thing is to
recalculate from the original timeout value.
This is extremely difficult to test, since it requires that the
select(2) call be interrupted twice by signals. The only way to do
this is by sending two signals to a program from another program (or
threads, with pthread_kill(3)) with less than half of the time left,
then send data to cause the loop to exit with success.
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
| |
|
