| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
|
|
|
|
|
| |
That occured with the removal of the qt3support dependency.
The setIcon call was added after the merge request was created.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Revert "Revert the integration of the merge request 2286."
This reverts commit e3edad83a1e6e99a551d40d4118352435c6dd710.
This had been submitted in the Qt 4.7, but reverted because
the change was to intrusive to be pushed in a stable branch.
Now re-apply the change in master.
Conflicts:
tools/qtconfig/mainwindowbase.cpp
tools/qtconfig/mainwindowbase.h
tools/qtconfig/paletteeditoradvancedbase.cpp
tools/qtconfig/paletteeditoradvancedbase.h
tools/qtconfig/paletteeditoradvancedbase.ui
tools/qtconfig/previewwidgetbase.cpp
tools/qtconfig/previewwidgetbase.h
tools/qtconfig/previewwidgetbase.ui
tools/tools.pro
|
|
|
|
|
|
|
| |
... by defining it ourselves. That symbol is missing in the header files
for Symbian.
Reviewed-by: Shane Kearns
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Task-number: QTBUG-1352
|
|
|
|
|
|
|
|
|
| |
This allows to set the sslPeerName even when not using
connectToHostEncrypted, but rather connectToHost + startClientEncryption
Task-number: QTBUG-1352
Merge-request: 1110
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
|
|
|
|
|
|
|
|
| |
As suggested by p--hartmann in a comment for MR 1574.
Task-number: QTBUG-1352
Merge-request: 1110
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
|
|
|
|
|
|
|
| |
...to client QSslSocket connections when supported by openssl as per
task tracker id #188841
Merge-request: 1574
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
|
|\ |
|
| |
| |
| |
| | |
RevBy: Trust me
|
| |
| |
| |
| | |
RevBy: Liang Qi
|
| |
| |
| |
| |
| |
| | |
It fails the build anyway.
RevBy: Liang Qi
|
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
RevBy: Trust me
|
| |\
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/network/access/qnetworkreplyimpl.cpp
tests/auto/moc/tst_moc.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Better to make it relative to the profile. That way it is always
found, regardless of where Qt is located.
RevBy: Liang Qi
|
| | |
| | |
| | |
| | | |
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| | |
| | |
| | |
| | | |
RevBy: Trust me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-17731
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
So that if these font engines are deallocated elsewhere (by
QFontCache for instance), we can still access them in QTextEngine.
Task-number: QTBUG-17603
Reviewed-by: Eskil
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a case where finished() and finishedWithError()
were both emitted for a single reply.
Reviewed-by: Peter Hartmann
|
| | | |
|
| | |
| | |
| | |
| | | |
Proper bugfix will come with later commit.
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | | |
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The host seems to have closed the port and we should not use that server
for testing anyway.
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Using file engines directly does not anymore have the benefit intended.
We now use QFile again as we did before.
Reviewed-by: Martin Petersson
|
| | |
| | |
| | |
| | | |
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
|
| | | |
|
| | |
| | |
| | |
| | | |
Reviewed-by: Olivier Goffart
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
HTTP requests are run in a separate thread now.
This required some big changes in the QNetworkAccessHttpBackend.
There is a new class QHttpThreadDelegate which lives in the
HTTP thread and is the communication layer between HTTP code
and QNetworkAccessHttpBackend. Communication is done
via signals/slots.
The synchronous HTTP code (private QtWebKit API) also had to
be completely re-worked and uses its own thread now.
Reviewed-by: Peter Hartmann
Task-number: QTBUG-14162
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QPixmap::handle(): Pixmap is not an X11 class pixmap
The problem was that the QBitmap constructor would re-create a
copy of the bitmap in a image (because we are using the raster
graphicssystem)
Reviewed-by: sroedal
|
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes the tst_qnetworkreply getFromUnreachableIp() test on Windows.
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | | |
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | | |
Reviewed-by: Markus Goetz
|
| | |
| | |
| | |
| | |
| | |
| | | |
fread() used in the wrong way so test failed on Windows.
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
|
| | | |
|
| | |
| | |
| | |
| | | |
It was unable to find the scripts
|