summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵Qt Continuous Integration System2010-02-2074-13/+14641
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (114 commits) 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. Optimise iterations over QHash. Use snippets. Reorder members to remove hole. Expand documentation for QNAM::setConfiguration() and friends. Fix build on Windows, typo. Fix build on Windows. ...
| * Merge remote branch 'origin/master' into mobility-masterRohan McGovern2010-02-19723-12762/+87258
| |\ | | | | | | | | | | | | 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.
| * | Don't load NetworkManager plugin in NetworkManager is not available.Aaron McCarthy2010-02-184-6/+20
| | |
| * | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-1715-74/+86
| |\ \
| * | | Disable NLA plugin, build generic on win32 and mac.Aaron McCarthy2010-02-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The NLA plugin locks up on exit for some programs, though not all. Disable for now until cause is found. Always build generic plugin on win32 and mac.
| * | | Fix segfault.Aaron McCarthy2010-02-161-14/+17
| | | | | | | | | | | | | | | | manager may be 0.
| * | | Remove debug output.Aaron McCarthy2010-02-161-4/+4
| | | |
| * | | Don't block forever if no bearer plugins are loaded.Aaron McCarthy2010-02-161-0/+5
| | | |
| * | | Always build generic plugin when building NetworkManager plugin.Aaron McCarthy2010-02-161-1/+3
| | | |
| * | | 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-14340-163/+106772
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| * \ \ \ Merge branch 'laptop/bearermanagement/integration' into ↵Aaron McCarthy2010-02-126-4/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | bearermanagement/integration
| | * | | | Fix build on Windows, typo.Aaron McCarthy2010-02-121-1/+1
| | | | | |
| | * | | | 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.
| * | | | | Merge remote branch 'staging/master' into bearermanagement/integrationAaron McCarthy2010-02-122-3/+16
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵Qt Continuous Integration System2010-02-12129-213/+15035
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (165 commits) Add 'We mean it.' header. Use provided typedef for QNetworkConfigurationPrivatePointer. Fix public includes. Document networkSessionOnline() signal and mark as internal. Tag new classes as since 4.7. Fix documentation. Remove debug. Update copyright year to 2010. We don't need to migrate cached replies. Fix after reworking to use signals/slots. Remove debug. Rename and remove unused private slots. Add comments to private state enums. Revert "(ODBC) Use wchar_t instead of assuming 2 bytes." Move check for range header support to before deleting backend. Don't try to migrate finished or aborted requests. Clarify TemporaryNetworkFailureError docs. Remove functions used for testing. Connect signals between QNAM and QNetworkReplyImpl. Fix networkAccessEnabled implementation. ...
| * | | | | | 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
| | |/ / / / | |/| | | |
| * | | | | Merge remote branch 'origin/master' into master-mobilityRohan McGovern2010-02-1113-124/+356
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| * | | | | | Add 'We mean it.' header.Aaron McCarthy2010-02-111-2/+13
| | | | | | |
| * | | | | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-11260-3350/+9646
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure
| * | | | | | | Use provided typedef for QNetworkConfigurationPrivatePointer.Aaron McCarthy2010-02-114-15/+11
| | | | | | | |
| * | | | | | | Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-11193-995/+3059
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/s60installs.pro
| * | | | | | | | Fix public includes.Aaron McCarthy2010-02-1113-13/+12
| | | | | | | | |
| * | | | | | | | 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-117-48/+21
| | | | | | | | |
| * | | | | | | | Update copyright year to 2010.Aaron McCarthy2010-02-1120-21/+21
| | | | | | | | |
| * | | | | | | | We don't need to migrate cached replies.Aaron McCarthy2010-02-111-6/+5
| | | | | | | | |
| * | | | | | | | Fix after reworking to use signals/slots.Aaron McCarthy2010-02-112-3/+1
| | | | | | | | |
| * | | | | | | | Remove debug.Aaron McCarthy2010-02-112-8/+0
| | | | | | | | |
| * | | | | | | | Rename and remove unused private slots.Aaron McCarthy2010-02-115-85/+31
| | | | | | | | |
| * | | | | | | | Add comments to private state enums.Aaron McCarthy2010-02-111-7/+7
| | | | | | | | |
| * | | | | | | | Move check for range header support to before deleting backend.Aaron McCarthy2010-02-111-6/+6
| | | | | | | | |
| * | | | | | | | Don't try to migrate finished or aborted requests.Aaron McCarthy2010-02-111-2/+6
| | | | | | | | |
| * | | | | | | | Clarify TemporaryNetworkFailureError docs.Aaron McCarthy2010-02-101-1/+2
| | | | | | | | |
| * | | | | | | | Remove functions used for testing.Aaron McCarthy2010-02-103-11/+0
| | | | | | | | |
| * | | | | | | | Connect signals between QNAM and QNetworkReplyImpl.Aaron McCarthy2010-02-104-31/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of iterating over children, when network session state changes.
| * | | | | | | | Fix networkAccessEnabled implementation.Aaron McCarthy2010-02-103-42/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move QDisabledNetworkReply to more appropriate source files. Return -1 from QDisabledNetworkReply::readData(). Always allow local access (via QNetworkAccessFileBackend).
| * | | | | | | | Convert Maemo6 backend into plugin.Aaron McCarthy2010-02-1017-1349/+1091
| | | | | | | | |
| * | | | | | | | Add networkAccess property to QNAM.Aaron McCarthy2010-02-093-1/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables network access via QNAM to be enabled/disabled.