summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Build fix for mingwThierry Bastian2009-07-142-2/+2
| | | | | we should include qt_windows.h and not windows.h because we have to define WINVER to 0x500.
* Merge commit 'origin/4.5'Bill King2009-07-081-1/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/ibase/qsql_ibase.cpp tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp tests/auto/qsqldatabase/tst_databases.h tests/auto/qsqldatabase/tst_qsqldatabase.cpp translations/qt_ru.ts
| * 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
* | src/network: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT ↵miniak2009-07-012-24/+6
| | | | | | | | | | | | | | support Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Fix bad mergesBradley T. Hughes2009-06-261-1/+1
| |
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-1724-48/+48
|\ \ | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| * \ Merge license header changes from 4.5Volker Hilsheimer2009-06-1624-48/+48
| |\ \ | | |/
| | * Update license headers as requested by the marketing department.Jason McDonald2009-06-1624-48/+48
| | | | | | | | | | | | Reviewed-by: Trust Me
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-052-1/+2
|\ \ \ | |/ /
| * | Compile when -no-qt3-support is on.Sarah Smith2009-06-051-0/+1
| | | | | | | | | | | | | | | | | | | | | As checked in was compiling with QDataStream(QByteArray *, int) and that method is only available when compiling with qt3 support. Reviewed-by: Julian de Bhal
| * | All of Qt's own code compiles with -pedantic now (but pcre and webkit don't ↵David Faure2009-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | seem fixable easily) Merge-request: 594 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-293-4/+4
|\ \ \ | |/ /
| * | improved string operations all over the placeThierry Bastian2009-05-283-4/+4
| |/ | | | | | | | | used character operations whenever possible better usage of QLatin1String
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-263-19/+4
|\ \ | |/ | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.h src/gui/graphicsview/qgraphicsitem_p.h
| * Fix another compilation breakage introduced by the fix to theThiago Macieira2009-05-231-15/+0
| | | | | | | | | | | | | | | | | | compilation breakage introduced in 6c1d7e57. The fix in fc7a43cce did fix the failure, but created another one because qhostinfo_win.cpp also had a copy of qt_sockaddr_in6 Reviewed-by: Jason McDonald
| * Fixed compilation with -qtnamespaceMarkus Goetz2009-05-222-4/+4
| | | | | | | | | | Task-number: 254333 Reviewed-by: Andy Shaw <qt-info@nokia.com>
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-201-1/+1
|\ \ | |/
| * Fix some typos in the documentation.Frederik Schwarzer2009-05-181-1/+1
| | | | | | | | | | | | Usually, "the the" is not proper English Reviewed-By: Thiago Macieira
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-121-0/+9
|\ \ | |/
| * Document that we don't support NTLM version 2.Thiago Macieira2009-05-111-0/+9
| | | | | | | | | | Task-number: 236925 Reviewed-by: Tor Arne Vestbø
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-05-081-7/+15
|\ \ | |/ | | | | windows-7-multitouch
| * Make QNetworkProxy calculate the capabilities for a new proxy typeThiago Macieira2009-05-071-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | If you write: QNetworkProxy proxy; proxy.setType(QNetworkProxy::HttpProxy); Then now QNetworkProxy will set the capabilities to the default value for the new proxy type. Previously, it wouldn't do that: default values were set only for the type passed in the constructor. Reviewed-by: Peter Hartmann
| * Clarify documentation in QNetworkProxy about SOCKS5 supporting domainThiago Macieira2009-05-071-4/+5
| | | | | | | | | | | | name resolution Task-number: 252761
| * make relative #include relative to the current fileOswald Buddenhagen2009-04-021-1/+1
| | | | | | | | i.e., use "", not <> and thus rely on the include path
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Bradley T. Hughes2009-04-071-3/+3
|\ \ | | | | | | | | | windows-7-multitouch
| * \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-011-3/+3
| |\ \ | | |/ | | | | | | | | | Conflicts: src/gui/inputmethod/qximinputcontext_x11.cpp
| | * QNetworkInterface: fix listing of all interfacesPeter Hartmann2009-04-011-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Before, we returned 0 for many interfaces because we picked up the IPv6 address regardless whether it was 0 or not. Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com> Task-number: 249312
| * | Fix compilation with MS VS 2005Friedemann Kleint2009-03-301-1/+1
| |/
* | compileBradley T. Hughes2009-03-301-1/+1
|/
* Doc - added QHostInfo to QHostAddress' See Also line, as requested byKavindra Devi Palaraja2009-03-261-1/+1
| | | | | | | the task. Task-number: 249423 Reviewed-by: TrustMe
* Long live Qt 4.5!Lars Knoll2009-03-2325-0/+9030
generated by cgit v0.12 at 2025-02-14 12:27:52 (GMT)