summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-195-49/+70
|\ | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
| * QNAM HTTP: Clean code a bitMarkus Goetz2010-02-182-29/+45
| | | | | | | | | | | | .. and some changes that will help us track down bugs Reviewed-by: Peter Hartmann
| * QNAM HTTP: Always set channel.reply to 0 when doneMarkus Goetz2010-02-185-22/+27
| | | | | | | | | | | | | | This will help us to track down a sporadic bug that made requests being sent again even if they were already done. Reviewed-by: Peter Hartmann
* | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-1/+1
|\ \ | |/ | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h
| * HTTP backend: remove commentPeter Hartmann2010-02-171-1/+1
| | | | | | | | | | | | the date header always needs to be updated in the cache. Task-number: QTBUG-7466
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-188-29/+108
|\ \ | | | | | | | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h tests/auto/gestures/tst_gestures.cpp
| * | Revert "remove -lz from OPENSSL_LIBS so as to respect qt-zlib"Mark Brand2010-02-171-6/+0
| | | | | | | | | | | | | | | | | | | | | This reverts commit 7228fdef61fd126481574e53d6d022d134219cc3. Merge-request: 405 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | remove -lz from OPENSSL_LIBS so as to respect qt-zlibMark Brand2010-02-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | OPENSSL_LIBS can introduce -lz. To respect qt-zlib, this must be replaced with -lQtCore4. Otherwise, linking can fail due to there being two different libraries providing zlib. Merge-request: 405 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | QNAM HTTP: More micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-3/+7
| | | | | | | | | | | | Reviewed-by: Zeno Albisser
| * | QNAM HTTP: Some micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-9/+16
| | | | | | | | | | | | Reviewed-by: Thiago
| * | QNAM HTTP: Trivial optimizationMarkus Goetz2010-02-171-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | Reorder switch. Directly return instead of having a null QByteArray, using append and then returning it. Reviewed-by: Peter Hartmann
| * | QNetworkAccessManager: add method to send custom requestsPeter Hartmann2010-02-168-6/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method was added to support e.g. HTTP OPTIONS (needed by Webkit); rather than adding one method for each of those exotic verbs, there is now a generic version for all. Reviewed-by: Markus Goetz Reviewed-by: Andreas Kling Task-number: QTBUG-8206
* | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-174-31/+59
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-02-162-7/+21
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits) QLocalSocket::isValid on Windows must check for broken connection fix pipe handle leak in qlocalsocket_win.cpp GraphicsViewBenchmark: Run app in full screen mode on small desktops. Fix Thai text on Windows 7 Fix License headers. QTextCodec::codecForName. Insert in the cache in all cases. Prevented calling the pixmap filter implementations with null pixmaps. Make it possible to run benchmarks with the "-graphicssystem" switch. Add support for running the GraphicsViewBenchmark application manually. Bump version to 4.6.3. Fixed a GLX warning that occured with some Intel chipsets under X11. Fixed compile for maemo6. Cleanup QEglContext & EGLDisplays Moved 'hasAlpha' property from GL2 engine to GL paint device. Remove useless qDebug in QTextCodec autotest QTextCodec: Symbian has codec for UCS2, only fallback to UTF16 if UCS2 codec cannot be loaded Add caching to QTextCodec::codecForName and QTextCodec::codecForMib Add benchmark for QTextCodec Fix several bugs with GL texture cache Compile fix for OpenGL ES. ...
| | * QLocalSocket::isValid on Windows must check for broken connectionJoerg Bornemann2010-02-161-1/+4
| | | | | | | | | | | | Reviewed-by: ossi
| | * fix pipe handle leak in qlocalsocket_win.cppJoerg Bornemann2010-02-162-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | Destroying a QLocalSocket with unwritten data left unclosed handles behind. The connection wasn't closed properly, such that the other end didn't get notified about the connection loss. Task-number: QTBUG-7815 Reviewed-by: ossi
| * | QNAM HTTP: Unify socket EOF handling a bitMarkus Goetz2010-02-162-24/+38
| |/ | | | | | | Reviewed-by: Peter Hartmann
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-1/+1
|\ \ | |/ | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp
| * doc: Fixed several typos.Martin Smith2010-02-121-1/+1
| | | | | | | | Task: QTBUG-7997
* | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-124-34/+65
|\ \ | |/
| * QNAM HTTP: Optimize detectPipeliningSupport()Markus Goetz2010-02-111-7/+7
| | | | | | | | | | | | Do cheap checks first. Reviewed-by: TrustMe
| * QNAM HTTP: Set channel to IdleState at better placeMarkus Goetz2010-02-111-3/+3
| | | | | | | | | | | | | | | | | | | | The readyRead() from the expand() function called from allDone() had a new request triggered for that channel even if it is not really finished yet. Move the assignment to IdleState inside allDone to avoid this error. Reviewed-by: Andreas Kling Reviewed-by: Peter Hartmann
| * QNAM HTTP: Forgot to remove a qDebug()Markus Goetz2010-02-091-1/+1
| | | | | | | | Reviewed-by: TrustMe
| * QNAM HTTP: Reserve bytes for HTTP parsingMarkus Goetz2010-02-091-0/+12
| | | | | | | | Reviewed-by: Peter Hartmann
| * QNetworkCookie(Jar): fix includesPeter Hartmann2010-02-092-2/+2
| | | | | | | | | | | | we need to include the module preefix in public headers Reviewed-by: Denis Dzyubenko
| * QNAM HTTP: Improve readHeader() of the HTTP replyMarkus Goetz2010-02-091-11/+25
| | | | | | | | | | | | | | Just read() instead us using peek() and bytesAvailable() Also don't use the obfuscated line ending checking code. Reviewed-by: Peter Hartmann
| * QNAM HTTP: Improve parseStatus() of HTTP replyMarkus Goetz2010-02-091-10/+12
| | | | | | | | | | | | Just read() instead us using peek() and bytesAvailable() Reviewed-by: Peter Hartmann
| * QNAM HTTP: Fix issue with some serversMarkus Goetz2010-02-091-2/+5
| | | | | | | | | | | | | | | | | | The call to eatWhitespace() must only be done before reading the status, not while reading it. (We can be in ReadingStatusState for multiple loop iterations) Task-number: QTBUG-7673 Reviewed-by: Peter Hartmann
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-042-3/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Use a shared QScriptEngine for debugger console command scripts Fix QtScript debugger hang/crash issue with updating locals model doc: Fixed some qdoc warnings. Always activate popup windows on show doc: Fixed some qdoc warnings. Add the QMAKE_FILE_EXT variable to extra compilers generation. Cocoa: Tool Windows steal focus from the main window qdoc3: Removed a debug output. Update QTestLib documentation with chart use case.
| * | doc: Fixed some qdoc warnings.Martin Smith2010-02-042-3/+23
| | |
* | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Olivier Goffart2010-02-044-10/+36
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | Conflicts: examples/assistant/simpletextviewer/findfiledialog.cpp qmake/generators/symbian/symmake.cpp tools/assistant/lib/qhelpgenerator.cpp tools/assistant/lib/qhelpsearchquerywidget.cpp translations/translations.pri
| * QTcpServer: Clarify thread affinity of incoming QTcpSocketMarkus Goetz2010-02-031-0/+9
| | | | | | | | | | | | | | | | We had some bugreports and support requests related to misunderstandings about this. Reviewed-by: Peter Hartmann Reviewed-by: David Boddie
| * QNAM HTTP: Fix bug related to re-sending a requestMarkus Goetz2010-02-033-10/+27
| | | | | | | | | | | | | | Thanks Nils Jeisecke for report and proposed fix. Task-number: QTBUG-7713 Reviewed-by: thiago
* | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-0116-51/+80
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qeventdispatcher_mac.mm src/gui/kernel/qt_cocoa_helpers_mac.mm src/gui/widgets/qmenu_mac.mm tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * Call cheaper clear() instead of assigning new QString()Markus Goetz2010-01-284-19/+19
| | | | | | | | | | Reviewed-by: joao Reviewed-by: Peter Hartmann
| * Fix some foreach usage to use const refsMarkus Goetz2010-01-285-6/+6
| | | | | | | | Reviewed-by: joao
| * Core classes, examples, demos: Some changes from string to charMarkus Goetz2010-01-282-3/+3
| | | | | | | | Reviewed-by: Peter Hartmann
| * QNativeSocketEngine: Set OS error strings on failed read()Markus Goetz2010-01-253-4/+7
| | | | | | | | Reviewed-by: thiago
| * QNativeSocketEngine: Also handle unknown errors from socket engineMarkus Goetz2010-01-251-0/+5
| | | | | | | | | | | | Task-number: QTBUG-7316 Task-number: QTBUG-7317 Reviewed-by: thiago
| * QFileNetworkReply: Use a QFileEngineMarkus Goetz2010-01-252-19/+38
| | | | | | | | | | | | Slight performance increase. Reviewed-by: Peter Hartmann
| * QNativeSocketEngine_win: Don't mess with linger settingsMarkus Goetz2010-01-251-2/+4
| | | | | | | | Reviewed-by: thiago
* | Merge commit 'oslo1/master' into oslo1-masterRohan McGovern2010-02-014-48/+71
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/getting-started/installation.qdoc src/gui/dialogs/qfiledialog_win.cpp tools/assistant/tools/assistant/centralwidget.cpp tools/assistant/tools/assistant/helpviewer.cpp
| * \ Merge branch '4.6'Thiago Macieira2010-01-216-71/+73
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchquerywidget.cpp
| * \ \ Merge branch '4.6'Thiago Macieira2010-01-182-4/+1
| |\ \ \
| * \ \ \ Merge branch '4.6'Thiago Macieira2010-01-13136-208/+317
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | | | QNAM: Add priority to the API and use it for HTTPHolger Hans Peter Freyther2010-01-123-1/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QHttpNetworkRequest and other classes already knew about the priority. Change QNetworkRequest to export this as API. It will be used in WebKit to tag high priority html, javascript and css files as such. Reviewed-By: Markus Goetz
| * | | | | Merge branch '4.6'Thiago Macieira2010-01-083-27/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2009-12-265-197/+260
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/webkit/fancybrowser/main.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/bookmarkmanager.cpp
| * \ \ \ \ \ \ Merge commit 'origin/4.6'Olivier Goffart2009-12-151-1/+3
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * | | | | | | | Added missing include file.jasplin2009-12-151-0/+1
| | | | | | | | |
generated by cgit v0.12 at 2025-03-26 05:30:40 (GMT)