summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* qtconfig: don't connect to qt3support signalsOlivier Goffart2011-02-282-7/+8
|
* Fix errors and warnings in qtconfig.Olivier Goffart2011-02-282-2/+2
| | | | | | That occured with the removal of the qt3support dependency. The setIcon call was added after the merge request was created.
* Remove qt3support dependency of qtconfigOlivier Goffart2011-02-2823-2798/+1496
| | | | | | | | | | | | | | | | | | | | | 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
* SSL TLS extension on Symbian: work around missing symbolPeter Hartmann2011-02-281-0/+6
| | | | | | | ... by defining it ourselves. That symbol is missing in the header files for Symbian. Reviewed-by: Shane Kearns
* SSL: Switch default version to TLS 1.0Peter Hartmann2011-02-285-9/+9
| | | | | | | | | | | 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
* QSslSocket backend: resolve symbols for SNI for SymbianPeter Hartmann2011-02-281-0/+3
| | | | Task-number: QTBUG-1352
* Add QSslSocket::setPeerVerifyName()/peerVerifyName()David Faure2011-02-282-0/+31
| | | | | | | | | 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>
* QSslSocket SNI: prefer verificationPeerName then peerName then hostNameDavid Faure2011-02-281-2/+5
| | | | | | | | | 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>
* Add Server Name Identification (RFC4366 section 3.1)Daniel Black2011-02-284-0/+22
| | | | | | | | ...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>
* Merge remote branch 'earth/master' into masterJoão Abecasis2011-02-2853-638/+2109
|\
| * Readded a ';;' that was removed by mistake.axis2011-02-281-0/+1
| | | | | | | | RevBy: Trust me
| * Fixed mkspec detection for Symbian.axis2011-02-251-3/+2
| | | | | | | | RevBy: Liang Qi
| * Removed javascript-jit from default symbian-gcce build.axis2011-02-251-0/+2
| | | | | | | | | | | | It fails the build anyway. RevBy: Liang Qi
| * QAbstractSocket: Check for socket state on Unbuffered readsMarkus Goetz2011-02-251-0/+2
| | | | | | | | | | | | | | 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
| * Corrected a mismerge in GCCE link parameters.axis2011-02-241-1/+1
| | | | | | | | RevBy: Trust me
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-24874-19632/+39788
| |\ | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkreplyimpl.cpp tests/auto/moc/tst_moc.cpp
| * | QAbstractSocket: Check for engine validity on Unbuffered readsMarkus Goetz2011-02-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | tst_qnetworkreply: fix the MiniHttpServer.Martin Petersson2011-02-241-1/+5
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | tst_qnetworkProxyFactory: fix debug output.Martin Petersson2011-02-241-2/+2
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | Fixed incorrect referral to an include file.axis2011-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | Better to make it relative to the profile. That way it is always found, regardless of where Qt is located. RevBy: Liang Qi
| * | tst_qnetworkreply: getErrors() only ignore warning for the specific testMartin Petersson2011-02-241-1/+6
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | Check engine existence before increasing reference countJiang Jiang2011-02-241-3/+6
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Fixed library casing.axis2011-02-241-1/+1
| | | | | | | | | | | | RevBy: Trust me
| * | Fix Q_INVOKABLE declared after Q_PROPERTYOlivier Goffart2011-02-242-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | tst_qnetworkreply: small improvementsMartin Petersson2011-02-241-10/+15
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | QNAM: Add a warning for misuse of the file backend.Martin Petersson2011-02-241-0/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-17731 Reviewed-by: Markus Goetz
| * | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-02-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | QNAM HTTP: Be more strict with HTTP channel stateMarkus Goetz2011-02-242-11/+30
| | | | | | | | | | | | | | | | | | | | | This fixes a case where finished() and finishedWithError() were both emitted for a single reply. Reviewed-by: Peter Hartmann
| * | tst_qnetworkreply: Add a test for broken gzip encodingMarkus Goetz2011-02-241-0/+27
| | |
| * | QNAM HTTP: Add qWarning() for double-finished() bugMarkus Goetz2011-02-231-0/+10
| | | | | | | | | | | | Proper bugfix will come with later commit.
| * | fix documentation typos in isLowSurrogate and requiresSurrogatesJeremy Katz2011-02-231-2/+2
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | SSL backend: loat root certificates on demand on Unix (excluding Mac)Peter Hartmann2011-02-2312-15/+611
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | tst_qnetworkreply: Fix httpProxyCommands() on Windows.Martin Petersson2011-02-221-1/+4
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | do not test against imap.trolltech.comPeter Hartmann2011-02-211-5/+0
| | | | | | | | | | | | | | | | | | | | | The host seems to have closed the port and we should not use that server for testing anyway. Reviewed-by: Markus Goetz
| * | QNAM File: Switch back to use QFileMarkus Goetz2011-02-212-36/+18
| | | | | | | | | | | | | | | | | | | | | Using file engines directly does not anymore have the benefit intended. We now use QFile again as we did before. Reviewed-by: Martin Petersson
| * | tst_qnetworkreply: Skip known to be broken setReadBufferSize testingMarkus Goetz2011-02-211-2/+4
| | | | | | | | | | | | Reviewed-by: Martin Petersson
| * | Stabilize tst_qtimerOlivier Goffart2011-02-211-3/+5
| | | | | | | | | | | | | | | | | | | | | Using QTRY_VERIFY We should wait more if the timer events did not get received in time because the system was busy.
| * | QNAM HTTP: Define SynchronousRequestAttribute instead of enum hackMarkus Goetz2011-02-215-20/+18
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | QNAM HTTP: Fix compilation 2Markus Goetz2011-02-211-2/+8
| | |
| * | QNAM HTTP: Fix compilationMarkus Goetz2011-02-211-4/+6
| | | | | | | | | | | | Reviewed-by: Olivier Goffart
| * | tst_qnetworkreply: Fixes for building without SSL supportMarkus Goetz2011-02-211-0/+6
| | |
| * | QNAM: Threaded HTTP implementationMarkus Goetz2011-02-2117-507/+1272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Avoid warning when seting a window iconOlivier Goffart2011-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | QNativeSocketEngine: Check for WSAEADDRNOTAVAIL on Windows.Martin Petersson2011-02-181-0/+5
| | | | | | | | | | | | | | | | | | This fixes the tst_qnetworkreply getFromUnreachableIp() test on Windows. Reviewed-by: Markus Goetz
| * | QAbstractSocket: compile without QT3SupportMartin Petersson2011-02-181-1/+1
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | QNativeSocketEngine: Only do SIO_UDP_CONNRESET for UDP socketsMartin Petersson2011-02-181-9/+11
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| * | tst_networkSelfTest: fix smbServer() testMartin Petersson2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | fread() used in the wrong way so test failed on Windows. Reviewed-by: Markus Goetz
| * | QAbstractSocket: Do not always change notifier on setReadBufferSizeMartin Petersson2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix tst_v8Olivier Goffart2011-02-171-2/+2
| | |
| * | Fix tst_sunspider.cppOlivier Goffart2011-02-171-1/+1
| | | | | | | | | | | | It was unable to find the scripts