summaryrefslogtreecommitdiffstats
path: root/src/network/kernel
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-193-5/+1
|\ | | | | | | | | Conflicts: src/corelib/tools/qlocale_symbian.cpp
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-173-5/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro mkspecs/features/resources.prf mkspecs/features/uic.prf src/corelib/io/qurl.cpp src/corelib/tools/qlocale_symbian.cpp src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicswidget_p.cpp src/gui/graphicsview/qgraphicswidget_p.h src/gui/util/qsystemtrayicon_win.cpp src/multimedia/audio/qaudioinput.cpp tests/auto/qhostinfo/qhostinfo.pro
| | * QHostInfo: Remove unused includesRitt Konstantin2010-05-053-5/+1
| | | | | | | | | | | | Reviewed-by: Markus Goetz
| | * Don't rely on tryStart() to do job control.Thiago Macieira2010-04-201-4/+2
| | | | | | | | | | | | | | | | | | | | | It may fail but threads become available the next instant. Instead, simply use our own currentLookups count. Reviewed-by: Markus Goetz
* | | doc: Fixed many broken links.Martin Smith2010-05-191-2/+2
|/ /
* | QHostInfo: Avoid one tiny copy of QHostInfo object when emittingMarkus Goetz2010-05-051-1/+1
| | | | | | | | | | | | Thanks rittk! Reviewed-by: Olivier
* | QHostInfo: Emit postponed lookup results when finishing currentMarkus Goetz2010-05-052-0/+14
| | | | | | | | Reviewed-by: Thiago
* | QHostInfo: Immediately delete aborted lookup requests.Markus Goetz2010-05-051-0/+17
| | | | | | | | Reviewed-by: Thiago
* | Don't rely on tryStart() to do job control.Thiago Macieira2010-04-261-4/+2
| | | | | | | | | | | | | | It may fail but threads become available the next instant. Instead, simply use our own currentLookups count. Reviewed-by: Markus Goetz
* | [tst_qhostinfo] Properly clean up the cache and lookup threads.Thiago Macieira2010-04-202-5/+20
| | | | | | | | | | | | Ensure that one test won't interfere with the next Reviewed-by: Markus Goetz
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-252-0/+4
|\ \ | |/ | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * Stop QHostInfo thread pool when application is about to exitBradley T. Hughes2010-03-222-0/+4
| | | | | | | | | | | | | | | | | | | | Ensure that the threadpool QHostInfo uses internally has cleanup its threads when the application exits. This avoids the warning from QWaitCondition on Windows (which happens due to thread termination at application exit). Task-number: QTBUG-7691 Reviewed-by: mgoetz
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-151-1/+1
|\ \ | |/ | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * QHostInfo: Compile fixMarkus Goetz2010-03-081-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-062-11/+182
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Document some stuff in QHostInfo and QAbstractSocketMarkus Goetz2010-03-041-0/+7
| |
| * DNS Cache: Also check inside the DNS threadsMarkus Goetz2010-03-041-6/+18
| | | | | | | | Reviewed-by: joao
| * Add DNS caching to QHostInfoMarkus Goetz2010-03-022-7/+154
| | | | | | | | | | | | By default enabled, but it can be disabled via a compile flag. Reviewed-by: Thiago
| * QHostInfo: Forgot to free some stuff on application exit.Markus Goetz2010-03-011-0/+5
| | | | | | | | Reviewed-by: TrustMe
* | Remove QObject::tr() in the network module code.Friedemann Kleint2010-02-242-2/+4
|/
* Call cheaper clear() instead of assigning new QString()Markus Goetz2010-01-281-2/+2
| | | | | Reviewed-by: joao Reviewed-by: Peter Hartmann
* Fix some foreach usage to use const refsMarkus Goetz2010-01-281-2/+2
| | | | Reviewed-by: joao
* Update copyright year to 2010Jason McDonald2010-01-0625-25/+25
| | | | Reviewed-by: Trust Me
* Change QHostInfo to use 5 parallel lookup threadsMarkus Goetz2009-12-173-194/+257
| | | | | | | | Instead of sequentially looking up and potentially taking a long time, we now do work in parallel. Reviewed-by: ogoffart Reviewed-by: lars
* Fix QWindowsSystemProxy::initMarkus Goetz2009-11-241-1/+4
| | | | | | | | Seems like WinHttpGetIEProxyConfigForCurrentUser can return more than one proxy even if this is not documented. Task-number: QTBUG-5981 Reviewed-by: Peter Hartmann
* QHostInfo: do not wait forever on cleanupPeter Hartmann2009-11-041-2/+4
| | | | | | | | | | patch by Warwick Allison. On cleanup in QHostInfoAgent, we were waiting forever for the thread to terminate, which did not always succeed due to a Linux kernel bug. Now, we just wait for some time and then return anyway. Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-5296
* Merge branch '4.5' into 4.6Thiago Macieira2009-10-161-1/+6
|\ | | | | | | | | Conflicts: src/gui/egl/qegl_symbian.cpp
| * QNetworkProxyFactory: Never return empty list on windowsMarkus Goetz2009-10-161-1/+6
| | | | | | | | | | Task-number: Salesforce 00062670 Reviewed-by: Thiago
* | Fix QHostInfo IP resolution when there's no reverse for the IP.Thiago Macieira2009-10-092-50/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you try to resolve 10.3.4.6, you're probably going to get that it doesn't exist. On some systems, getnameinfo will return the IP address in string form (Linux, without NI_NAMEREQD). On some others, it will fail (Mac, Windows). So harmonise by gracefully handling the case in which getnameinfo fails. Possible behaviour change: we don't try the forward resolution any more, after completing the reverse one. Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | API review: change function name to setUseSystemConfiguration.Thiago Macieira2009-10-062-3/+3
| | | | | | | | Requested-By: Volker Hilsheimer
* | Fix tr-Errors/remove QObject::tr(), mainly in ScriptToolsFriedemann Kleint2009-09-291-1/+1
| | | | | | | | | | | | Note: Those messages are to be translated in Qt 4.6 for the first time. Reviewed-by: Kent Hansen <khansen@trolltech.com>
* | Merge commit 'origin/4.5' into 4.6Andreas Aardal Hanssen2009-09-281-0/+3
|\ \ | |/ | | | | | | | | | | | | | | Reviewed-by: Joao Conflicts: src/gui/graphicsview/qgraphicsview.cpp src/gui/widgets/qspinbox.cpp tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * QHostAddress: Clarification about DNSMarkus Goetz2009-09-251-0/+3
| | | | | | | | Task-number: QT-1683
| * Update license headers again.Jason McDonald2009-09-0824-96/+96
| | | | | | | | Reviewed-by: Trust Me
* | Removed a debug output that was a bit annoyingThorbjørn Lindeijer2009-09-151-2/+1
| | | | | | | | Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
* | Update license headers again.Jason McDonald2009-09-0926-104/+104
| | | | | | | | Reviewed-by: Trust Me
* | QHostInfoPrivate: Uninitialized intMarkus Goetz2009-09-041-2/+3
| |
* | Performance: don't call WinHttpGetProxyForUrl for a file URL (e.g. from webkit)David Faure2009-08-311-1/+6
| | | | | | | | | | | | | | | | | | That method can be slow, since it does a DHCP query followed by a DNS query (sometimes followed by a Netbios query, too)... no point in doing it for every file URL loaded in webkit. Merge-request: 1128 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
* | Update license header for new file from merge requestThiago Macieira2009-08-311-14/+14
| |
* | Add QNetworkProxyFactory::setUseSystemConfigurationEnabled(true)David Faure2009-08-313-0/+110
| | | | | | | | | | | | | | Simply following the system configuration for the proxy used to require writing a QNetworkProxyFactory subclass. The static setter makes this easier, so apps can in one line say "I want to use the system proxy settings". Solution and method name suggested by Thiago.
* | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311-13/+13
| | | | | | | | Reviewed-by: Trust Me
* | Merge branch '4.5' into 4.6Thiago Macieira2009-08-3124-312/+312
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp demos/boxes/vector.h demos/embedded/fluidlauncher/pictureflow.cpp demos/embedded/fluidlauncher/pictureflow.h doc/src/desktop-integration.qdoc doc/src/distributingqt.qdoc doc/src/examples-overview.qdoc doc/src/examples.qdoc doc/src/frameworks-technologies/dbus-adaptors.qdoc doc/src/geometry.qdoc doc/src/groups.qdoc doc/src/objecttrees.qdoc doc/src/platform-notes.qdoc doc/src/plugins-howto.qdoc doc/src/qt3support.qdoc doc/src/qtdbus.qdoc doc/src/qtdesigner.qdoc doc/src/qtgui.qdoc doc/src/qtmain.qdoc doc/src/qtopengl.qdoc doc/src/qtsvg.qdoc doc/src/qtuiloader.qdoc doc/src/qundo.qdoc doc/src/richtext.qdoc doc/src/topics.qdoc src/corelib/tools/qdumper.cpp src/gui/embedded/qkbdpc101_qws.cpp src/gui/embedded/qkbdsl5000_qws.cpp src/gui/embedded/qkbdusb_qws.cpp src/gui/embedded/qkbdvr41xx_qws.cpp src/gui/embedded/qkbdyopy_qws.cpp src/gui/embedded/qmousebus_qws.cpp src/gui/embedded/qmousevr41xx_qws.cpp src/gui/embedded/qmouseyopy_qws.cpp src/gui/painting/qpaintengine_d3d.cpp src/gui/painting/qwindowsurface_d3d.cpp src/opengl/gl2paintengineex/glgc_shader_source.h src/opengl/gl2paintengineex/qglpexshadermanager.cpp src/opengl/gl2paintengineex/qglpexshadermanager_p.h src/opengl/gl2paintengineex/qglshader.cpp src/opengl/gl2paintengineex/qglshader_p.h src/opengl/util/fragmentprograms_p.h src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp src/script/parser/qscript.g src/script/qscriptarray_p.h src/script/qscriptasm_p.h src/script/qscriptbuffer_p.h src/script/qscriptclass.cpp src/script/qscriptclassdata_p.h src/script/qscriptcompiler.cpp src/script/qscriptcompiler_p.h src/script/qscriptcontext.cpp src/script/qscriptcontext_p.cpp src/script/qscriptcontext_p.h src/script/qscriptcontextfwd_p.h src/script/qscriptecmaarray.cpp src/script/qscriptecmaarray_p.h src/script/qscriptecmaboolean.cpp src/script/qscriptecmacore.cpp src/script/qscriptecmadate.cpp src/script/qscriptecmadate_p.h src/script/qscriptecmaerror.cpp src/script/qscriptecmaerror_p.h src/script/qscriptecmafunction.cpp src/script/qscriptecmafunction_p.h src/script/qscriptecmaglobal.cpp src/script/qscriptecmaglobal_p.h src/script/qscriptecmamath.cpp src/script/qscriptecmamath_p.h src/script/qscriptecmanumber.cpp src/script/qscriptecmanumber_p.h src/script/qscriptecmaobject.cpp src/script/qscriptecmaobject_p.h src/script/qscriptecmaregexp.cpp src/script/qscriptecmaregexp_p.h src/script/qscriptecmastring.cpp src/script/qscriptecmastring_p.h src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptengine_p.h src/script/qscriptenginefwd_p.h src/script/qscriptextenumeration.cpp src/script/qscriptextenumeration_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h src/script/qscriptextvariant.cpp src/script/qscriptfunction.cpp src/script/qscriptfunction_p.h src/script/qscriptgc_p.h src/script/qscriptmember_p.h src/script/qscriptobject_p.h src/script/qscriptprettypretty.cpp src/script/qscriptprettypretty_p.h src/script/qscriptvalue.cpp src/script/qscriptvalueimpl.cpp src/script/qscriptvalueimpl_p.h src/script/qscriptvalueimplfwd_p.h src/script/qscriptvalueiteratorimpl.cpp src/script/qscriptxmlgenerator.cpp src/script/qscriptxmlgenerator_p.h tests/auto/linguist/lupdate/testdata/recursivescan/project.ui tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp tests/auto/qkeyevent/tst_qkeyevent.cpp tools/linguist/shared/cpp.cpp
| * Update tech preview license header.Jason McDonald2009-08-3124-312/+312
| | | | | | | | Reviewed-by: Trust Me
| * Update URL of online documentation.Jason McDonald2009-08-111-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1124-24/+24
| | | | | | | | Reviewed-by: Trust Me
* | Merge commit 'qt/master'Jason Barron2009-08-203-19/+41
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/painting/svgviewer/files/bubbles.svg src/corelib/kernel/qobject.cpp src/network/kernel/qhostinfo.cpp tests/auto/qhostinfo/tst_qhostinfo.cpp
| * | compile fix for WindowsJoerg Bornemann2009-08-201-0/+1
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Fix literal IPv6 hostname resolution in QHostInfo.Thiago Macieira2009-08-203-19/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the series of commits ending in ff1280178, I made QUrl::toAce fail if the parameter is not a well-formed hostname (i.e., if it violates STD3). IPv6 hostnames do, so we can't preemptively run ToACE. Instead, delay running ToACE until we've tried literal matching. Reviewed-by: TrustMe
* | | Changed names and URLs to reflect name change.axis2009-08-191-1/+1
| | | | | | | | | | | | RevBy: Trust me
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-publicJason Barron2009-08-181-15/+11
|\ \ \
generated by cgit v0.12 at 2024-10-29 04:59:43 (GMT)