summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup and applied Qt coding style for qnetworkinterface_symbian.cppJanne Anttila2009-08-041-68/+46
|
* Squashed commit of the topic/exceptions branch.Harald Fernengel2009-08-0321-24/+24
| | | | | Contains some smaller fixes and renaming of macros. Looks big, but isn't scary at all ;)
* Trailing whitespace and tab/space fixes for QtNetworkJanne Anttila2009-08-0314-123/+122
|
* Small optimization.Aleksandar Sasha Babic2009-07-241-0/+4
| | | | Do not use route info for addresses other than IPV4.
* For some reason interface info on Symbian will notAleksandar Sasha Babic2009-07-241-2/+59
| | | | | | | | | | | | | give neither correct netmask nor broadcast address. But, experiments show that route info can be used to obtain netmask. Then is easy to calculate broadcast address. Idea is to match interface and destination address from routeinfo entry, and then to use given netmask. "Machines take me by surprise with great frequency." Alan Turing(1912 - 1954)
* Removed few compiler warnings when using NokiaX86 compiler.Janne Anttila2009-07-221-0/+1
|
* Merge commit 'origin/master' into 4.6-mergedJason Barron2009-07-097-11/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.cpp src/corelib/tools/qdumper.cpp src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/kernel/qwidget_s60.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkreplyimpl.cpp src/sql/drivers/ibase/qsql_ibase.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/network-settings.h tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qobjectrace/tst_qobjectrace.cpp tests/auto/qsqldatabase/tst_qsqldatabase.cpp tools/configure/configureapp.cpp translations/qt_ru.ts
| * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-07-075-8/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/network/access/qhttpnetworkconnection_p.h tests/auto/qstyle/qstyle.pro tests/auto/qstyle/tst_qstyle.cpp tools/configure/configureapp.cpp configure.exe will be recompiled in next commit. Took ours.
| | * Fixed dead code possibly leading to crash.Rohan McGovern2009-07-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Looks like this `&&' was meant to be `||'. QNetworkProxy::FtpCachingProxy is 5 so it's clearly impossible for type to be less than 0 and greater than QNetworkProxy::FtpCachingProxy. Reviewed-by: Aaron Kennedy
| | * fix crash in QLocalServer on WinCE when waitForNewConnection times outJoerg Bornemann2009-06-301-1/+1
| | | | | | | | | | | | Reviewed-by: mauricek
| | * QNetworkAccessManager stuff: Some fixes for coverityMarkus Goetz2009-06-293-6/+13
| | | | | | | | | | | | | | | | | | A few "fixes" to make that number go down.. Reviewed-by: Thiago Macieira
| * | Removed unused static data from Qt.axis2009-07-061-2/+0
| | | | | | | | | | | | This saves memory and prevents warnings from RVCT.
| * | Removed pointless variables to silence warnings from RVCT.axis2009-07-061-2/+0
| | |
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-06-29127-265/+359
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/gui/dialogs/qfiledialog_p.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp tests/auto/network-settings.h tests/auto/qitemdelegate/tst_qitemdelegate.cpp
* | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-30127-368/+533
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp
| * | | QNAM HTTP Code: Properly use the QRingBuffer for some kind of data.Markus Goetz2009-06-293-28/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the QRingBuffer properly when reading known-size, non-chunked, non-compressed data from HTTP. Reviewed-by: Thiago Macieira
| * | | Fix bad mergesBradley T. Hughes2009-06-261-1/+1
| | | |
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-262-0/+35
| |\ \ \
| | * \ \ Merge branch '4.5'Thiago Macieira2009-06-262-0/+35
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/network/access/qnetworkreplyimpl.cpp
| | | * | QNetworkReplyImpl: Protect against recursive event loopsMarkus Goetz2009-06-252-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a bug that occured together with a QProgressDialog. The signal emission was like: readyRead readyRead readyRead [...] readyRead finished readyRead Now finished should be properly at the ending of this sequence. Task-number: 256630 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-264-25/+61
| |\ \ \ \ | | |/ / /
| | * | | QNAM HTTP Code: Prepare for download performance improvementsMarkus Goetz2009-06-254-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the QByteArray to a QRingBuffer to save re-allocation time. Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | QNAM HTTP Code: Uncluttering functionsMarkus Goetz2009-06-253-18/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uncluttered and duplicated some function to make it more clear what is happening. Was a bit confusing before if compressed data or uncompressed data is handled. Reviewed-by: Peter Hartmann
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-243-7/+0
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp
| | * | | QNAM: Removed some dead codeMarkus Goetz2009-06-243-7/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-231-0/+14
| |\ \ \ \ | | |/ / /
| | * | | QNetworkDiskCache: add code snippets in documentationPeter Hartmann2009-06-221-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | should make it easier to apply a network disk cache with code snippets now Reviewed-by: David Boddie <dboddie@trolltech.com> Reviewed-by: Martin Petersson <martin.petersson@trolltech.com>
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-222-4/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicsscene.cpp
| | * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-191-3/+2
| | |\ \ \ | | | |/ /
| | | * | QNetworkAccessManager: Clarify doc about deleting QNetworkReplyMarkus Goetz2009-06-181-3/+2
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Volker Hilsheimer
| | * | | Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-06-181-1/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe tests/auto/qpainter/tst_qpainter.cpp translations/qt_ru.ts
| | | * | QNAM HTTP code: Do not close TCP connection in all casesMarkus Goetz2009-06-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure the keep-alive connections stay open even if someone deletes a QNetworkReply which will then go all the way down to removeReply(QHttpNetworkReply). Should fix http://lists.trolltech.com/pipermail/qt-interest/2009-June/007777.html Reviewed-by: Peter Hartmann
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-189-39/+57
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| | * | | QNAM: More comments, some renamingsMarkus Goetz2009-06-177-34/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed some classes and member variables. Their names were causing confusion before because. Reviewed-by: Peter Hartmann
| | * | | QNAM: Added comment to de-confuse myselfMarkus Goetz2009-06-171-0/+1
| | | | | | | | | | | | | | | | | | | | I mixed this up several times before, so here is the comment for it.
| | * | | QSslCertificate: Doc fixMarkus Goetz2009-06-171-3/+4
| | | | | | | | | | | | | | | | | | | | Change doc that refered to functions that got renamed
| | * | | QIoDevice and QAbstractSocket: Clarify doc about waitForReadyRead()Markus Goetz2009-06-171-2/+2
| | | | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-17127-269/+292
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| | * | | QNAM: Use QTcpSocket for HTTP if no encryption was requestedMarkus Goetz2009-06-171-9/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This stops QNetworkAccessManager from loading the OpenSSL libs, certificates etc. when they are not needed for the non-HTTPS case. Reviewed-by: mariusSO
| | * | | Merge license header changes from 4.5Volker Hilsheimer2009-06-16127-255/+255
| | |\ \ \ | | | |/ /
| | | * | Update license headers as requested by the marketing department.Jason McDonald2009-06-16127-254/+254
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | Fix wrong comparator in QSslCertificatePrivate::QByteArray_from_X509Markus Goetz2009-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because less-than instead of less-or-equal-than was used, the last line of a PEM encoding was not built when the raw length was multiple of 64. Task-number: 256066 Reviewed-by: mariusSO
| | * | | QSslCertificate: lazy loading of some dataMarkus Goetz2009-06-161-5/+11
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Andreas Aardal Hanssen
| * | | | Merge of masterBradley T. Hughes2009-06-159-24/+86
| | | | |
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-124-33/+26
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-085-3/+37
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-053-3/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-2915-75/+61
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-268-100/+64
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.h src/gui/graphicsview/qgraphicsitem_p.h
| * \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-204-6/+6
| |\ \ \ \ \ \ \ \ \
generated by cgit v0.12 at 2024-11-28 00:51:15 (GMT)