| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
| |
Task-number: QTBUG-15311
Reviewed-by: ogoffart
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Minor adjustments to merge-request 915
Implement brush transformations for directfb.
Add FreeBSD's certificate bundle to the certificates list.
SSL internals: upon error, read all errors from OpenSSL
Added an example for QTest::touchEvent to the documentation.
Push and pop the thread-default context for the current thread
Fix compilation by s/intptr_t/quintptr/
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The FreeBSD base system does not ship a certificate bundle, but the
ca_root_nss port provides one extracted from Mozilla's root CA list.
As discussed in QTBUG-14013, it should be preferrable to have bundle
files than separate certificate files, so the path for the certificate
has been added directly.
Signed-off-by: Raphael Kubo da Costa <kubito@gmail.com>
Merge-request: 896
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... and not only the last one. One call to OpenSSL can produce several
errors, which we should always read all. Otherwise, malicious clients
could intentionally poison the error queue.
Inspired-by: Merge request 2290
Reviewed-by: Olivier Goffart
Reviewed-by: Markus Goetz
Task-number: QTBUG-14513
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
SSL: Fix for capabilities in QSslCertificate auto test
Doc: update symbian capabilities regarding SSL
SSL: Fix crashes/hangs when retrieving CA certificates
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added error handling to the certificate retrieval thread
Made the certificate retrieval thread process critical (so if it crashes
the process will crash instead of hang)
Filter the certificate list to only fetch CA certificates which are in
X.509 format (symbian also allows WAP formats, but Qt does not support
these).
Put the TPtr8 for asynch function parameter in the class data so it does
not go out of scope while the function is in progress. Previously it was
on the stack so it could be corrupted before the certificate server had
finished using it.
Task-number: QTBUG-15005
Task-number: QTBUG-15126
Reviewed-by: Markus Goetz
|
| |
| |
| |
| |
| |
| |
| | |
Move the creation code to the top of QNAM::createRequest()
to avoid setting up a QNetworkSession when it is not needed.
Reviewed-by: ogoffart
|
| | |
|
|/
|
|
| |
Reviewed-by: Thiago Macieira
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (56 commits)
Give the toplevel widget a layout
fix tests when using Qt in a namespace
Fix tst_symbols auto test
trivial: fix build
Fix crash
fix isLikelyToBeNfs usage
Export isLikelyToBeNfs only if we have an internal build
Fixed QGraphicsView autotest to use a dummy toplevel widget
Fixed QMdiArea autotest to use a dummy toplevel widget.
Fixed QMenuBar autotest. Changed window activation order.
Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
Fixed QPathCliper autotest, to skip a test when qreal != double
Fixed QComboBox autotest to use a dummy toplevel widget
Fixed QColumnView autotest. Added an QApplication::processEvents
Fixed QAccessability autotest to use a dummy toplevel widget
Fix QListWidget test
Fix QGraphicsItems autotest
Fixed QGraphicsScene autotest to use a dummy toplevel widget
Fixed QGraphicsItem autotest to use a dummy toplevel widget
Fixed QListView autotest to use a dummy toplevel widget
...
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: (53 commits)
trivial: fix build
Fix crash
fix isLikelyToBeNfs usage
Export isLikelyToBeNfs only if we have an internal build
Fixed QGraphicsView autotest to use a dummy toplevel widget
Fixed QMdiArea autotest to use a dummy toplevel widget.
Fixed QMenuBar autotest. Changed window activation order.
Fixed QStyleSheetStyle autotest to use a dummy toplevel widget
Fixed QPathCliper autotest, to skip a test when qreal != double
Fixed QComboBox autotest to use a dummy toplevel widget
Fixed QColumnView autotest. Added an QApplication::processEvents
Fixed QAccessability autotest to use a dummy toplevel widget
Fix QListWidget test
Fix QGraphicsItems autotest
Fixed QGraphicsScene autotest to use a dummy toplevel widget
Fixed QGraphicsItem autotest to use a dummy toplevel widget
Fixed QListView autotest to use a dummy toplevel widget
Fixed QMenu autotest to use a dummy toplevel widget
Fixed QMenuBar autotest. Added mainwindow activation
Fixed QString autotest when QT_QLOCALE_USES_FCVT is set
...
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | | |
check the global network proxy for 0 before dereferencing
Reviewed-by: Robert Griebl
|
|/ /
| |
| |
| |
| |
| | |
Task-number: QTBUG-13431
Task-number: QTBUG-6276
Reviewed-by: ogoffart
|
|/
|
|
|
|
|
| |
Reset authenticator and fix operator=(...) of QAuthenticator.
Task-number: QTBUG-6792
Reviewed-by: ogoffart
|
|
|
|
| |
Reviewed-by: Morten Engvoldsen
|
|
|
|
|
|
| |
Me no speak americano.
Reviewed-by: Peter Hartmann
|
|
|
|
|
|
|
|
| |
* winsock2.h conflicts with qplatformdefs.h
* ifndef QT_NO_OPENSSL was missing
Reviewed-by: Prasanth
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
| |
Removed the distinction between reply error and connection error.
The QNetworkAccessManager was treating them the same way anyway.
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
| |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
| |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
| |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
| |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
| |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
| |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
| |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
| |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
| |
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
|
|
|
|
| |
Pause the socket notifiers because the user could be displaying a
dialog which makes the event loop run and could make our socket
notifiers fire.
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
|
|
|
|
|
| |
Pause the socket notifiers because the user could be displaying a
dialog which makes the event loop run and could make our socket
notifiers fire.
Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
|
| |
Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
|
|
|
|
| |
Fixes a bug where a different QNetworkReply(Impl) handles an
authentication request.
Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
|
|
|
|
|
|
| |
This is needed because user code might display a dialog which
spins an event loop and could make the sockets readyRead() fire.
This event loop recursion is not desired as it can lead to nasty
bugs when the state is messed up.
Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
|
|
|
| |
Copying the username and password messes up the state inside
the QAuthenticator. Do not do it.
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
|
|
|
| |
The credentials are now cached when the request gets sent.
Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
|
|
|
| |
The credentials shall only be loaded on demand, e.g. after the HTTP
code emits authenticationRequired()
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
|
|
|
|
|
| |
QNetworkAccessManager used the user() function for caching
the credentials when doing HTTP authentication with NTLMv2. For that
to work it needs to return the same value as was put in with setUser().
Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
Task-Number: QTBUG-13234
|
|
|
|
|
|
|
|
|
|
| |
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
|
| |
|
|
|
|
|
|
|
|
|
| |
If QNetworkConfigurationManager is deleted from the QApplication
destructor it will be deleted after QNetworkConfigurationManagerPrivate
global static (which is also deleted by QApplication). Fixed by testing
if connManager() returns 0 before use.
Task-number: QTBUG-14447
|
|
|
|
|
|
|
| |
This commit fixes getFromUnreachableIp()
Reviewed-by: Thiago Macieira
Task-Number: QTBUG-10679
|
|
|
|
|
|
|
| |
This was already fixed in 4.8, this is a hotfix for 4.7
Task-Number: QT-4096
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
|
|\ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-14213
Reviewed-by: David Boddie
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| | |
Don\t use \i for italics. Use \e.
Task: QTBUG-14133
|
|/
|
|
|
| |
Task-number: http://bugs.meego.com/show_bug.cgi?id=7777
Reviewed-by: Markus Goetz
|
|
|
|
|
|
|
|
|
|
| |
... by only reading in a certificate once. Before, we were adding all
files from all directories; since they often contained symlinks, the
same certificate was added several times.
Reviewed-by: Markus Goetz
Reviewed-by: Thiago Macieira
Task-number: QTBUG-14013
|
|
|
|
|
|
|
|
|
|
|
|
| |
This way both synchronous and asynchronous lookups are cached, resulting
in more reliable behavior: this issue was detected by kde's ktcpsockettest
where state() was sometimes HostLookupState and sometimes ConnectedState,
depending on whether the previous lookups were done by the thread or by
the blocking lookup in QAbstractSocket::waitForConnected.
Merge-request: 829
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Reviewed-by: Markus Goetz
|