summaryrefslogtreecommitdiffstats
path: root/src/network/access
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-255-54/+138
|\ | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| * Fix compile error with QT_NO_HTTPTasuku Suzuki2010-03-241-0/+8
| | | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * Remove extraneous semi-colon.Aaron McCarthy2010-03-231-1/+1
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-225-54/+130
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (78 commits) Moc: Add support for rvalue references in signals and slots. Add support for polyphonic greek Fix build failure on WinCE. Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors ...
| | * Revert "Don't emit open signal on session close/error."Aaron McCarthy2010-03-193-14/+0
| | | | | | | | | | | | This reverts commit 39818f933b958d504b9cc18487658209d1df22da.
| | * Rename networkAccess property to networkAccessible.Aaron McCarthy2010-03-193-31/+99
| | | | | | | | | | | | Add unit test and update docs.
| | * Don't emit open signal on session close/error.Aaron McCarthy2010-03-193-0/+14
| | |
| | * Rename private signal.Aaron McCarthy2010-03-194-12/+24
| | |
| | * Add flag to indicate that network sessions are expected on a platform.Aaron McCarthy2010-03-182-11/+7
| | |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7Alexis Menard2010-03-251-1/+8
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro
| * | QNAM HTTP: Do not use TCP_NODELAYMarkus Goetz2010-03-231-1/+8
| | | | | | | | | | | | Reviewed-by: thiago
* | | Merge branch '4.6-s60' into 4.7-s60axis2010-03-223-4/+17
|\ \ \ | |/ / | | / | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * QNAM HTTP: Fix no-headers and HTTP-100 handlingMarkus Goetz2010-03-163-4/+17
| | | | | | | | Reviewed-by: Thiago
* | QNetworkReply: Fix canReadLine()Markus Goetz2010-03-162-1/+9
| | | | | | | | Reviewed-by: Peter Hartmann
* | Abort waiting replies on session error.Aaron McCarthy2010-03-162-0/+18
| | | | | | | | | | Abort waiting QNetworkReplys with an error on session errors. Non waiting replies will likely fail by other means (e.g. broken sockets).
* | Only enable BM by default in QNAM for appropriate platforms.Aaron McCarthy2010-03-122-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | Bearer Management is of little use on desktop platforms. Change QNetworkAccessManager to only create a QNetworkSession for the default configuration on platorms where it is useful (Symbian & Maemo). On other platforms Bearer Management is still available, but needs to be explicitly enabled by the application developer by calling QNetworkAccessManager::setConfiguration(). Use of Bearer Management by default from QNetworkAccessManager is controlled by the QT_QNAM_BEARERMANAGEMENT_ENABLED define.
* | Fix creation of QNetworkSession.Aaron McCarthy2010-03-111-2/+2
| | | | | | | | | | | | If QNAM::setConfiguration(QNetworkConfiguration()) is called before the first network request is processed new session using the default configuration would be incorrectly created.
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-073-2/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits) fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. Allow empty authority in QUrl::setAuthority as per docs. Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority. fixed case of GL include directory check in MAC_APPLICATION_MENU translations Re-generate the Unicode tables after updates to the program that generates them Fix the code after merge: DerivedNormalizationProps has two or more columns add some usefull definitions to qunicodetables_p.h qchar.cpp: fix identation finish last commit prefer DerivedNormalizationProps.txt over CompositionExclusions.txt improve error reporting a bit more improve error reporting fix incorect condition check if string to int conversions were done w/o errors improve error reporting for unassigned grapheme/word/sentence break classes avoid using of qunicodetables_p.h in generator use QHash for line break map ...
| * | Don't keep polling network sessions open indefinitely.Aaron McCarthy2010-03-053-2/+22
| | |
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-1/+5
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * QNAM HTTP: Fix invoking a method when being destructed right nowMarkus Goetz2010-03-021-1/+5
| | | | | | | | Reviewed-by: Olivier Goffart
* | Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-277-8/+36
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-263-5/+8
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-243-5/+8
| | | |
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-264-3/+28
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | 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
| | * 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
* | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2214-103/+217
|\ \ | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp
| * \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-195-49/+70
| |\ \ | | |/ | | | | | | | | | Conflicts: tools/assistant/lib/qhelpsearchindexreader_clucene_p.h
| | * QNAM HTTP: Clean code a bitMarkus Goetz2010-02-182-29/+45
| | | | | | | | | | | | | | | | | | .. and some changes that will help us track down bugs Reviewed-by: Peter Hartmann
| | * QNAM HTTP: Always set channel.reply to 0 when doneMarkus Goetz2010-02-185-22/+27
| | | | | | | | | | | | | | | | | | | | | This will help us to track down a sporadic bug that made requests being sent again even if they were already done. Reviewed-by: Peter Hartmann
| * | Merge remote branch 'origin/4.6' into integration-master-from-4.6Rohan McGovern2010-02-181-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h
| | * HTTP backend: remove commentPeter Hartmann2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | the date header always needs to be updated in the cache. Task-number: QTBUG-7466
| * | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-188-29/+108
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/codecs/qtextcodec.h tests/auto/gestures/tst_gestures.cpp
| | * | QNAM HTTP: More micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-3/+7
| | | | | | | | | | | | | | | | Reviewed-by: Zeno Albisser
| | * | QNAM HTTP: Some micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-9/+16
| | | | | | | | | | | | | | | | Reviewed-by: Thiago
| | * | QNAM HTTP: Trivial optimizationMarkus Goetz2010-02-171-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder switch. Directly return instead of having a null QByteArray, using append and then returning it. Reviewed-by: Peter Hartmann
| | * | QNetworkAccessManager: add method to send custom requestsPeter Hartmann2010-02-168-6/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method was added to support e.g. HTTP OPTIONS (needed by Webkit); rather than adding one method for each of those exotic verbs, there is now a generic version for all. Reviewed-by: Markus Goetz Reviewed-by: Andreas Kling Task-number: QTBUG-8206
| * | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-172-24/+38
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
| | * QNAM HTTP: Unify socket EOF handling a bitMarkus Goetz2010-02-162-24/+38
| | | | | | | | | | | | Reviewed-by: Peter Hartmann
* | | 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.
* | | 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
| * | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp
| | * doc: Fixed several typos.Martin Smith2010-02-121-1/+1
| | | | | | | | | | | | Task: QTBUG-7997
generated by cgit v0.12 at 2025-02-09 03:30:16 (GMT)