| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| | |
scm.dev.troll.no:qt/qt-symbian-network into symbian-socket-engine
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
tests/auto/qsslsocket/tst_qsslsocket.cpp
|
| |
| |
| |
| |
| |
| |
| |
| | |
Increased timeout on some unstable test cases.
Added a Q_EXPECT_FAIL if we can't connect to a server which is inside
firewall.
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| | |
Convert assertions to failure, increase heap size to allow
creating 10MB buffers without std::bad_alloc exception or memory
allocation error from openssl.
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Mistake in the qfilesystemiterator_symbian implementation.
Readable without Writable was thought to mean show only read-only files,
but this isn't the expected behaviour of QDir[Iterator]
Added an autotest, as this was only covered by ssl tests in the network
layer.
Reviewed-by: joao
|
| |
| |
| |
| | |
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| | |
Excluded maemo code from symbian builds.
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Implemented a tunnel to get the QNetworkSession from QNetworkAccessManager
down to the socket engine. This is currently a private API for QNAM.
This patch only implements the FTP backend - the other backends are to
follow.
On Symbian, the native socket engine will extract the native session
(RConnection) from the QNetworkSession implementation, and use that to
open sockets using the explicitly specified session.
When no session is specified on the socket (default for networking usage
outside of QNAM) then the socket is opened with no RConnection specified,
which allows the IP stack to find any route via an open interface.
The QFtp autotest is enhanced to test QFtp with an explicit session as well
as implicit connectivity (where a QNetworkSession is opened by the user,
and then QFtp is used without a specified connection).
This autotest gives better coverage than the FTP test cases in QNetworkReply.
Reviewed-by: Markus Goetz
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
src/network/bearer/qnetworksession.cpp
src/network/kernel/qnetworkproxy_symbian.cpp
src/network/socket/qnativesocketengine_unix.cpp
tests/auto/platformsocketengine/tst_platformsocketengine.cpp
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Broadcast and multicast are optional features for network interfaces on
Symbian. WLAN supports both, while IPv4 and IPv6 loopback support only
multicast.
The test tries to start the bearer, to get an interface that does support
broadcast.
There is an expect fail for the 0 bytes written case, as this is what
happens on symbian if none of the interfaces support broadcast.
On the phones which don't have WLAN, this is likely.
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The unreachable IP test needs a longer timeout than on desktops.
The manual construction of a file:// URL was incorrect in the case where
SRCDIR is "." - this is changed to the recommended QUrl::fromLocalFile
API.
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The first few tests could randomly timeout due to delays in starting
the WLAN connection.
This is addressed by opening the default bearer in initTestCase, and
closing it in cleanupTestCase. This will keep the connection active for
the duration of the test, instead of activating/deactivating continuously.
The first SSL test could randomly timeout due to the delay in fetching the
CA certificates from the system (which can be very slow on some phones /
SIM cards).
This is addressed by preloading them in initTestCase - all the tests will
then get system SSL certs from the cache.
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Due to a race condition, the test could fail before its QThread had even
started, resulting in a crash during thread startup. This is addressed
using a semaphore to synchronise startup & ensure the sub thread is running
before continuing the test.
Additionally, if the test failed the QThread would be destroyed while
still running, which according to the documentation will cause crashes.
This is addressed using QScopedPointer to clean up when the test exits
early due to failure.
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
1. Increase maximum heap, as FTP large file test was running out
2. Add an additional QVERIFY so that a test fails instead of suffering
an assertion failure in case no data is received.
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | | |
Reviewed-by: mread
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Markus Goetz
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Markus Goetz
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Compile and instanciate the right engine.
Reviewed-by: Shane Kearns
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Instead of relying on the old behavior of the deprecated QString(QByteArray)
constructor which stops copying the byte array at the null termination
character if there is one embedded in the array, we copy the whole provided
QByteArray object into the QString when QStringBuilder is used.
Reviewed-by: Harald Fernengel
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
when QT_NO_CAST_FROM_ASCII is not defined, the string is assigned
to an string with more than ascii.
So if the codecForLocale is not latin1, it would fail.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QString() is a no-op if string is already a QString
And it fixes the compilation if other types are use that do not have
toLocal8Bit such as QStringBuilder.
WebKit trunk has an instance of such usage.
Reviewed-by: Joao
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
When reading large files that are greater in size than the
TEXTSTREAM_BUFFERSIZE buffer, calling pos() caused erroneous buffer
positioning. The cause of this was QTextStreamPrivate::readBufferOffset
value being updated, but QTextStreamPrivate::readConverterSavedStateOffset
was not. Usually, if pos() is called, it is called multiple times. Since
QTextStreamPrivate::readConverterSavedStateOffset was never reset,
QTextStreamPrivate::readBufferOffset would accumulate the wrong position
and QTextStreamPrivate::consume() will 'discard' the wrong number of
bytes from the buffer.
Task-number: QTBUG-9814
Merge-request: 2569
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
TLS is backward compatible, so servers only supporting SSL 3 should
still work. All browsers send a TLS 1.0 Client Hello these days.
However, some servers apparently have problems with a TLS handshake
(and a SNI message); for now, wait and see how many of them are
broken and either add a fallback to SSLv3 or blacklist them (i.e.
set the used SSL version for those servers explicitly).
Reviewed-by: Markus Goetz
|
|\ \ \ \ |
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/network/access/qnetworkreplyimpl.cpp
tests/auto/moc/tst_moc.cpp
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Markus Goetz
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Markus Goetz
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Markus Goetz
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
moc was starting to parse function one token too late. This was usually
unnoticed because there is usually a semi colon, or a colon, or some
other token that are ignored. But in this case, a Q_PROPERTY is not
ignored, the parsing would fail.
Reviewed-by: brad
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Markus Goetz
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Previously, on initializing the first QSslSocket, we read all root
certificates into memory (~ 150 files).
Now, we tell OpenSSL where to find the root certificates, so that they
can be loaded on demand (if supported, see 'man c_rehash' for details).
Reviewed-by: Markus Goetz
Task-number: QTBUG-14016
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The host seems to have closed the port and we should not use that server
for testing anyway.
Reviewed-by: Markus Goetz
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Martin Petersson
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Using QTRY_VERIFY
We should wait more if the timer events did not get received in time
because the system was busy.
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Peter Hartmann
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
fread() used in the wrong way so test failed on Windows.
Reviewed-by: Markus Goetz
|
|\ \ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (60 commits)
Fix QTBUG-17627: build break in mobility bearer applications
Add the missing image for doc of QNetworkSession.
Remove Qt dependancy to SYMBIAN_GRAPHICS_WSERV_QT_EFFECTS
Fix QPlainTextEdit corruption/crash with scrolling
DelayRemove of list delegate on section boundary duplicated section
add gsm to connectable bearer for networkmanager.
ListView and GridView indexAt should use qreal coordinates.
Prevent infinite loop in raster engine on zero dash pattern length.
Cocoa: Sheets looses focus when moving parent window
Removing tabs from 7388fcb83592a90aace054314e0c3e7e7a94fdae changeset
Fix QNetworkConfigurationManager crash due to null private pointer.
Fix animations with alwaysRunToEnd that are frequently stopped/started.
Fix auto test failure on mac.
Update QtGui def files
Another stab at fixing compilation on old Symbian platforms
Prevent an animation from being registered to run twice.
Add missing test file.
Add selected P1 tasks to changes file.
Added support for QMAKE_CLEAN in symbian-sbsv2
Only add NetworkServices capability automatically if no caps are set.
...
|
| |\ \ \ \ \ \ |
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
DelayRemove of list delegate on section boundary duplicated section
|
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
When removing a delegate with a removal animation that fell on a
section boundary (i.e. owned the section header), the following
item would also create a section header before the previous item was
removed. Make updateSections() include the removed, but visible items
in its update. Ensure updateSections() is called when the removed
item is destroyed to ensure a new section header is created at that
point.
Change-Id: Ie831e3acf65b2989ebb030e2ab38cdbe179a9d45
Task-number: QTBUG-17606
Reviewed-by: Michael Brasser
|
| |\ \ \ \ \ \ \ \
| | |/ / / / / / /
| | | | | / / / /
| | |_|_|/ / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Conflicts:
src/gui/kernel/qcocoaview_mac.mm
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
src/testlib/qtestcase.cpp
|
| | |\ \ \ \ \ \
| | | |/ / / / /
| | |/| | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevent infinite loop in raster engine on zero dash pattern length.
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-17053
Reviewed-by: Kim
|
| | |\ \ \ \ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Conflicts:
tools/qml/qml.pri
|