| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
| | |
| | |
| | |
| | |
| | | |
The API is very small, joinMulticastGroup(), leaveMulticastGroup(), and
the two QAbstractSocket socket options, MulticastTtlOption and
MulticastLoopbackOption.
|
| | | |
|
| | |
| | |
| | |
| | | |
This is a simple rename done for clarity.
|
| | |
| | |
| | |
| | |
| | | |
According to the MSDN docs, we can just use setsockopt() and
getsockopt() like we do on UNIX, even if we are using Winsock2.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
These options only make sense and work in QUdpSocket when using
multicasting. Previously, the loopback was set when joining a multicast
group, but the loopback flag is not a per-group flag, it's per socket,
hence this change.
The ability to set the multicast TTL is needed as well, so this is added
as a socket option as well.
Autotest updated to test both.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The code is very similar to the UNIX version, but not identical. It
appears the Microsoft compiler does not like the "interface" variable
name, so they have been renamed.
The autotest had a bug in it that I failed to notice before. The sender
was not sending to the multicast group, it was sending to the local
address of the receiver (which fails on Windows).
|
| | |
| | |
| | |
| | |
| | | |
It's not supported everywhere, so remove it for now until the need to
re-add it arises.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QHostAddress::Null and QHostAddress::Any are not the same, and we use
QHostAddress::Any to signify that we want any-source behavior in
QUdpSocket::joinMulticastGroup(). Any means we should skip the single-
support SSM, like Mac OS X).
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
If the system does not support SSM, but the source address is specified,
the error is unsupported socket operation, not unsupported protocol.
if setsockopt() returns an error we don't know about, set the error
code/string to unknown error
|
| | |
| | |
| | |
| | |
| | | |
d->socketEngine will be zero, which crashes. avoid this by returning if
the socket is not in the BoundState
|
| | |
| | |
| | |
| | |
| | | |
If a system does not support SSM (e.g. Mac OS X does not), then
requesting a specific sender results in a socket error.
|
| | |
| | |
| | |
| | |
| | |
| | | |
According to the Stevens book, the socket must be in the bound state
to be able to join the group, so we check for the same condition. We
support ASM and SSM (for IPv4). Windows implementation TBD.
|
| | |
| | |
| | |
| | |
| | | |
We don't support multicast via proxy, so these function just return
false.
|
| | |
| | |
| | |
| | |
| | |
| | | |
This is actually just done in the socket engine, so we need to add the
API for setting the loopback socket option and joining/leaving the
group. Implementation for the various engines will follow.
|
| | |
| | |
| | |
| | |
| | | |
Each function takes a groupAddress and optional source address,
network interface, and flags.
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
qmake/generators/win32/msvc_vcxproj.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-12608, QTBUG-12243
Reviewed-by: Markus Goetz
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Cannot enter text through character viewer on Mac (Cocoa)
QNAM HTTP: Remove eatWhitespace() hack
QNAM: Fix namespaced compilation
Revert the addition of the test of QtTest's random feature.
QAbstractSocket: Remove warning
QNAM Zerocopy: Benchmark
tst_qbytearray: Auto test for reserve()
tst_qiodevice: Add peek()ing auto test
tst_qnetworkreply: Zerocopy auto test
tst_qhttpnetworkconnection: Pipelining auto test
QNAM Zerocopy: QNAM implementation part
QNAM Zerocopy: HTTP implementation part
QAbstractSocket: Enable Unbuffered OpenMode for TCP
QNativeSocketEngine: Fix wrong debug output
Added QObject::senderSignalIndex()
Cleanup the connection list logic in QObject::sender
Fixed linking against libQtTest on Mac.
Added -random option to tests, making the test cases within a test execute in arbitrary order. Very useful for avoiding test cases being dependent on the running order.
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Peter Hartmann
Reviewed-by: Jeremy Katz
Reviewed-by: Aleksandar Sasha Babic
|
| | | | |
|
|\ \ \ \
| |/ / /
|/| / /
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qpainter.cpp
src/gui/text/qtextengine.cpp
tests/auto/qimage/tst_qimage.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | |
| | |
| | |
| | |
| | | |
Reviewer: David Boddie
Task number: QTBUG-11938
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/kernel/qapplication.cpp
tests/auto/qfileinfo/tst_qfileinfo.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
|
| | | |
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
This old workaround hurts performance on Linux but is only needed
on old kernels and in corner cases (using a local socket with
QAbstractSocket). Removing it.
Reviewed-by: Peter Hartmann
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
src/3rdparty/* is left untouched and not merged from 4.6. The corresponding
changes in Harfbuzz and WebKit are already in the 4.6 staging areas.
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/3rdparty/webkit/WebKit/qt/tests/qgraphicswebview/tst_qgraphicswebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebview/tst_qwebview.qrc
tests/auto/qtextlayout/tst_qtextlayout.cpp
tests/auto/qwidgetaction/tst_qwidgetaction.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If we're connected to a name pipe which is in message mode, we have to
handle the following case: ReadFile() or GetOverlappedResult() return
FALSE and GetLastError() returns ERROR_MORE_DATA.
This just means, that the message didn't fit into the pipe's internal
buffer. We must not handle this as error.
Task-number: QTBUG-11490
Reviewed-by: ossi
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
In waitForReadyRead we didn't check for synchronous connection loss.
Autotest added: tst_QLocalSocket::syncDisconnectNotify
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If we notice a broken pipe via _q_notified, we should call close
in case the internal read buffer is empty.
Auto test added: tst_QLocalSocket::asyncDisconnectNotify
Reviewed-by: ossi
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
src/3rdparty/webkit merged with checkout --ours
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/platform/text/qt/TextBreakIteratorQt.cpp
src/gui/kernel/qt_s60_p.h
src/gui/text/qfontdatabase_s60.cpp
src/script/api/qscriptengine.cpp
|
| |
| |
| |
| | |
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| | |
QLocalSocketPrivate::bytesAvailable has been renamed to
QLocalSocketPrivate::checkPipeState to match the purpose of this method.
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Reading from a socket with a broken connection didn't work, even if
there were still bytes to read in the internal read buffer.
Autotest: tst_QLocalSocket::writeToClientAndDisconnect
Task-number: QTBUG-10921
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Don't call GetOverlappedResult if ConnectNamedPipe connects instantly.
Autotest: tst_qlocalsocket::threadedConnection
Task-number: QTBUG-8477
Done-with: ossi
Reviewed-by: ossi
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/spectrum/app/app.pro
src/gui/egl/qegl.cpp
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qmenu/tst_qmenu.cpp
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
qt_safe_write and and qt_safe_read already contain EINTR_LOOP.
It seems that this loop has been added to code due to
merge/clean-up errors in commits:
4aafbd6222e7aeafd59a4a4356ba8c53b2bfa1d1
f0a8feed9e9b4de10df76faa350201edaef98f1d
Reviewed-by: Aleksandar Sasha Babic
Reviewed-by: Markus Goetz
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (158 commits)
qdoc: Yet another revision of the top doc page.
Doc: Update on web template
Added QDateTime::msecsTo()
Doc: Fixed tables and images for the new docs
qdoc: Yet another revision of the top doc page.
Revert "Improve QUrl handling of local file paths"
Revert "[QNAM FTP] Check for the "ftp" scheme case-insensitively"
Revert "QUrl::fromLocalFile: fix silly mistake: it's fromNativeSeparators, not to"
Revert "Use QUrl::isLocalFile and fix the scheme checking in local URLs."
qdoc: Another revision of the top doc page.
Doc correction to css
Doc: Updates to the html template and javascript
tst_SuiteTest: Fix a meaningless switch statement
My 4.7.0 changelog entries.
qdoc: Fixed annotated list generation to use <td>, not <th>.
Doc: Tuning search script
qdoc: Reorganized examples panel.
Doc: Chages to search feature, css and table order
QtDeclarative: avoid waiting for a network load on URIs with empty schemes.
QtDeclarative: RFC 3986 requires schemes to be considered case-insensitively
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (132 commits)
Make QCompleter cope with restricted screen real estate (mobile devices)
Don't initialize Wintab if QT_NO_TABLETEVENT is defined.
QDBusXmlGenerator: get the true name from QMetaType for the return type
Add missing newline to static XML snippet
Fix compilation in C++0x mode (narrowing of constants)
My changelog entries for core and network
Doc: updating html and search feature
my changelog
Doc - mention vcsubdirs as a possible value for TEMPLATE
doc: Second attempt to begin reorganizing the top doc page.
Fix syntax error in configure script
fix qmake project file following msvc2010 addition
remove extraneous return statement
cosmetics: change enum value
isOnActiveSpace is available from 10.6.
QTcpServer: Fix documentation for previous commit
Keep support for maximum pending connections in derived QTcpServer
[QNAM FTP] Check for the "ftp" scheme case-insensitively
Use QUrl::isLocalFile and fix the scheme checking in local URLs.
Improve QUrl handling of local file paths
...
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
By adding a new function to the class QTcpServer it's now possible to
extend QTcpserver functionality with for instance SSL capabilities and
still keep the support for maximum pending connections.
Task-number: QTBUG-1875
Reviewed-by: Peter Hartmann
Reviewed-by: Markus Goetz
Merge-Request: 568
|
|/ / /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Socket connect in Symbian may return non-standard EPIPE error,
after which the connection is terminated. Added Symbian specific
workaround to set socket to UnconnectedState if EPIPE errno is
received. In addition a bug report for Open C is created:
http://developer.symbian.org/bugs/show_bug.cgi?id=2676
Task-number: QT-3362
Reviewed-by: Aleksandar Sasha Babic
Reviewed-by: Markus Goetz
|
|\ \ \
| |/ /
|/| /
| |/
| | |
Conflicts:
translations/translations.pri
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If _q_onNewConnection failed, then QLocalServer got into a bad state.
QLocalServer::isListening() still returned true and
QLocalServer::close() crashed.
Task-number: QTBUG-10388
Reviewed-by: ossi
|
| |
| |
| |
| |
| |
| |
| | |
If we're not even going to connect, there's no point in trying to get
the host resolution
Reviewed-By: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| | |
If we're not even going to connect, there's no point in trying to get
the host resolution
Reviewed-By: Markus Goetz
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (55 commits)
Revert "Removed double setting of _WIN32_WINNT"
Revert "removed a few warnings on wince builds"
removed a few warnings on wince builds
Removed double setting of _WIN32_WINNT
QTreeView: remove dead code.
doc: Clarify effect of QFont::NoFontMerging
Revert "Implement heightForWidth support for QTabWidget and QStackedLayout."
build fix for S60
Improve handling of QAction in soft key manager
Remove useless assert
qdrawhelper: fix optim in 2245641ba
QSlider and StyleSheet: fix one pixel error while drawing the SliderAddPage
accelerate QWindowsPipeWriter for bigger chunks of data
Fix antialiasing with transformed text in OpenGL2 paint engine
Fix flattening of largely scaled, thin, dashed beziers.
Increased the precision used to flatten beziers
Fix QT_NO_MOVIE
Fix compile error with QT_NO_ACTION in QtGui
Fix QT_NO_COMPLETER
Fix QT_NO_FSCOMPLETER
...
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Don't put pipes into message mode.
This makes it possible to not split data into 2k chunks.
Reviewed-by: ossi
|
|\ \ \
| |/ /
|/| /
| |/ |
|