summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Mac Style: Compile FixMartin Petersson2011-03-141-1/+1
| | | | | Task-number: QTBUG-13055 Reviewed-by: Markus Goetz
* Mac: Center the Window title on Cocoa.Martin Petersson2011-03-101-0/+2
| | | | | Task-number: QTBUG-13593 Reviewed-by: Richard Moe Gustavsen
* Fix corner of scroll area so it is stylable on Mac.Martin Petersson2011-03-101-1/+1
| | | | | Task-number: QTBUG-13055 Reviewed-by: Olivier Goffart
* QNAM HTTP: Pair channels with requests at a later state.Martin Petersson2011-03-103-24/+48
| | | | | | | | | | | Connect a new channel only when there is no one currently available. Only pair the request with the channel once we know if it got connected or not. This leads to faster sending on requests as we reuse already connected channels that became free in the meanwhile. Task-number: QTBUG-17084 Reviewed-by: Markus Goetz Reviewed-by: Peter Hartmann
* Windows: Activate the context menu on tray icons when shown.Martin Petersson2011-03-101-0/+1
| | | | | Task-number: QTBUG-14807 Reviewed-by: Markus Goetz
* SSL backend: check at runtime for the right OpenSSL version for SNIPeter Hartmann2011-03-044-3/+9
| | | | | | | | | | | SNI = Server Name Indication. The function "SSL_ctrl()" has been there since always in OpenSSL, but not with the specific enum SSL_CTRL_SET_TLSEXT_HOSTNAME, so let's avoid the call for older versions. Additionally, fix the resolving of SSL_CTX_load_verify_locations for Symbian (is not used in Symbian yet). Reviewed-by: Markus Goetz
* QNAM HTTP: Fix the ioPostToHttpFromSocket auto testMartin Petersson2011-03-043-7/+18
| | | | | | | Introduced a ClosingState for the channel to better track the state of the socket. Reviewed-by: Markus Goetz
* Fixed documentation for QByteArrayDenis Dzyubenko2011-03-031-16/+19
| | | | | | | The data returned by constData() will not be null-terminated if the QByteArray was created from an existing raw data with QByteArray::fromRawData(). Reviewed-by: Oswald Buddenhagen
* Improve handling QByteArray with QStringBuilderDenis Dzyubenko2011-03-032-4/+5
| | | | | | | | | 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
* Do not handle posted events in QSplashScreen.Denis Dzyubenko2011-03-032-4/+10
| | | | | | | | When QSplashScreen waits for the window to be fully shown, we shouldn't re-enter the event loop by processing posted events. Reviewed-by: axis Reviewed-by: Olivier Goffart
* Wrap qPrintable inside QStringOlivier Goffart2011-03-011-1/+1
| | | | | | | | | | 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
* Fix QTextStream::pos() causes buffer offset issues on large text files.Chris Kawano2011-03-011-0/+1
| | | | | | | | | | | | | | | | 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>
* 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-284-7/+7
| | | | | | | | | | | 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-2835-590/+1450
|\
| * 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
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-24310-2507/+9095
| |\ | | | | | | | | | | | | | | | 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
| * | 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-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | 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
| * | 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-235-14/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | 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
| * | QNAM HTTP: Define SynchronousRequestAttribute instead of enum hackMarkus Goetz2011-02-213-4/+4
| | | | | | | | | | | | 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
| * | 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
| * | 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
| * | Remove useless processEventOlivier Goffart2011-02-171-1/+0
| | | | | | | | | | | | | | | Task-number: QTBUG-17469 Reviewed-by: Joao
* | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-02-261-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Always prepend drive letter to $$EPOCROOT in Windows Symbian builds Add files deployed using qmake_emulator_deployment.flm to 'what' list QRuntimeWindowSystem: Track window size properly
| * \ \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-251-0/+1
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-241-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QRuntimeWindowSystem: Track window size properly
| | | * | | QRuntimeWindowSystem: Track window size properlySami Kyostila2011-02-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The runtime window system has a 'proxy' window surface which wraps the currently active window surface. When the window geometry changes, the new geometry is properly communicated to the wrapped window surface. However, the new geometry is not updated into the runtime window surface proxy itself, which means that when queried, the geometry for the window surface will always be invalid. This patch fixes the issue. Fixes: QT-4588 Merge-request: 1098 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-02-2560-304/+597
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| * | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-02-244-11/+15
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-02-241-3/+2
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix QTBUG-17627: build break in mobility bearer applications