summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-064-14/+211
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-042-0/+15
| |
| * DNS Cache: Also check inside the DNS threadsMarkus Goetz2010-03-041-6/+18
| | | | | | | | Reviewed-by: joao
| * QNAM HTTP: Fix invoking a method when being destructed right nowMarkus Goetz2010-03-021-1/+5
| | | | | | | | Reviewed-by: Olivier Goffart
| * QAbstractSocket: Use new faster DNS functionMarkus Goetz2010-03-021-2/+16
| | | | | | | | | | | | | | Use qt_qhostinfo_lookup which avoids the event loop when the DNS result is already cached. Reviewed-by: Thiago
| * 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
* | doc: Fixed some qdoc errors.Martin Smith2010-03-021-1/+1
| |
* | Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-03-0211-13/+49
|\ \ | | | | | | | | | | | | Conflicts: src/plugins/bearer/corewlan/qcorewlanengine.mm
| * \ Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-2710-12/+48
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qmetatype.cpp src/declarative/graphicsitems/qdeclarativeevents.cpp src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/qml/qdeclarativescript.cpp src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativebehavior.cpp src/declarative/util/qdeclarativeeasefollow.cpp src/declarative/util/qdeclarativefontloader.cpp src/declarative/util/qdeclarativelistmodel.cpp src/declarative/util/qdeclarativespringfollow.cpp src/declarative/util/qdeclarativestategroup.cpp src/declarative/util/qdeclarativesystempalette.cpp src/declarative/util/qdeclarativetimer.cpp src/declarative/util/qmlstateoperations.cpp src/multimedia/qml/qdeclarativeaudio.cpp src/multimedia/qml/qdeclarativevideo.cpp
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-265-7/+12
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits) fix "configure -fast" on Windows for other maketools than nmake Get qmake to add pdb files to install target in debug configuration. add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX give symbian an own platform mode deprecate -win32/-unix/-macx which set both host and target mode decouple host platform mode from target platform mode factor out applyHostMode() make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins use QDir::separator() instead of Option::dir_sep where appropriate simplify string ops sanitize evaluation of OS scopes instead of hard-coding recursion for symbian, add it to the specs add possibility to request project recursion from within a pro file fix ts-assistant target use QList::reserve() as appropriate optimize appending of (empty) lists to (empty) lists suppress pointer aliasing warnings Fix compilation with namespace. Assistant: Make ~AbstractHelpViewer() virtual. Prepare German translations for 4.7 (except Quick). ...
| | | * | Remove QObject::tr() in the network module code.Friedemann Kleint2010-02-245-7/+12
| | | | |
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-265-5/+36
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| | | * QNAM HTTP: Switch back to QueuedConnection for requeueRequest.Markus Goetz2010-02-241-2/+16
| | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | | * QNAM HTTP: Set some values after clear() in a QHttpNetworkReplyMarkus Goetz2010-02-241-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | | * QNetworkAccessManager: Documentation enhancementsMarkus Goetz2010-02-241-1/+8
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann Reviewed-by: David Boddie
| | | * QAbstractSocket: Clarify documentationMarkus Goetz2010-02-221-2/+8
| | | | | | | | | | | | | | | | Reviewed-by: Thiago
| | | * QNetworkRequest: Doc enhancementMarkus Goetz2010-02-221-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| * | | Fix compilation with Sun CC: const in POD parameters makes a differenceThiago Macieira2010-02-271-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | The compiler should have caught this error, but instead it accepted the QDisableNetworkReply constructor without the const. And that led to a linker error. Reviewed-by: Trust Me
* | | Bearer management changes from Qt Mobility (fca9891).Aaron McCarthy2010-03-023-1/+9
|/ / | | | | | | fca98911b75ce12e70d93cfc2932a9759758a605
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵Qt Continuous Integration System2010-02-2327-11/+3293
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (120 commits) Make compile on Maemo6. Fix build on Symbian. Change initialization order. Increase try verify timeout. Add locking to bearer code. Fixed qnetworksession test on Mac. Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. Simplify. ...
| * | Change initialization order.Aaron McCarthy2010-02-221-1/+1
| | |
| * | Add locking to bearer code.Aaron McCarthy2010-02-226-102/+136
| | | | | | | | | | | | | | | QNetworkConfigurationManagerPrivate and QBearerEngine derived classes need to be thread-safe.
| * | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2216-110/+238
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp
| * | | Allow QNAM to be created as a global variable.Aaron McCarthy2010-02-182-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | QNetworkConfigurationManager cannot be loaded before QApplication as the plugins it loads may create timers. Which fail because timers can only be created in threads created with QThread.
| * | | Fix segfault.Aaron McCarthy2010-02-161-14/+17
| | | | | | | | | | | | | | | | manager may be 0.
| * | | Don't block forever if no bearer plugins are loaded.Aaron McCarthy2010-02-161-0/+5
| | | |
| * | | Add QT_MODULE headers.Aaron McCarthy2010-02-153-0/+6
| | | |
| * | | Change docs: "phone" -> "device".Aaron McCarthy2010-02-151-1/+1
| | | |
| * | | Remove unused code.Aaron McCarthy2010-02-152-59/+0
| | | |
| * | | Simplify.Aaron McCarthy2010-02-151-2/+1
| | | |
| * | | Optimise iterations over QHash.Aaron McCarthy2010-02-153-34/+41
| | | |
| * | | Use snippets.Aaron McCarthy2010-02-151-8/+1
| | | |
| * | | Reorder members to remove hole.Aaron McCarthy2010-02-151-4/+4
| | | |
| * | | Expand documentation for QNAM::setConfiguration() and friends.Aaron McCarthy2010-02-151-4/+29
| | | |
| * | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-142-11/+11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| * | | | Fix build on Windows.Aaron McCarthy2010-02-125-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | On Windows interface is #defined to struct. Make sure that qnetworksession.h is included before qplatformdefs.h.
| * | | | Move http resume code into http backend.Aaron McCarthy2010-02-124-18/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds two new virtual functions to QNetworkAccessBackend: bool canResume() const; and void setResumeOffset(quint64) canResume() is used to query the existing backend if resuming is supported for the current request. setResumeOffset() is used to set an additional offset which should be applied when the backend posts the request. The default implementation of canResume() returns false (resuming not supported). The default implementation of setResumeOffset() does nothing.
| * | | | Fix compiler warning, unused variable.Aaron McCarthy2010-02-121-2/+0
| | | | |
| * | | | Add 'We mean it.' header.Aaron McCarthy2010-02-111-2/+13
| | | | |
| * | | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-116-48/+100
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure
| * | | | | Use provided typedef for QNetworkConfigurationPrivatePointer.Aaron McCarthy2010-02-113-12/+9
| | | | | |
| * | | | | Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-1118-62/+119
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/s60installs.pro
| * | | | | | Fix public includes.Aaron McCarthy2010-02-116-6/+5
| | | | | | |
| * | | | | | Document networkSessionOnline() signal and mark as internal.Aaron McCarthy2010-02-111-0/+12
| | | | | | |
| * | | | | | Tag new classes as since 4.7.Aaron McCarthy2010-02-113-0/+6
| | | | | | |
| * | | | | | Fix documentation.Aaron McCarthy2010-02-111-1/+15
| | | | | | |
| * | | | | | Remove debug.Aaron McCarthy2010-02-111-31/+18
| | | | | | |
| * | | | | | Update copyright year to 2010.Aaron McCarthy2010-02-115-5/+5
| | | | | | |
| * | | | | | We don't need to migrate cached replies.Aaron McCarthy2010-02-111-6/+5
| | | | | | |
generated by cgit v0.12 at 2024-12-04 10:54:38 (GMT)