summaryrefslogtreecommitdiffstats
path: root/src/network
Commit message (Collapse)AuthorAgeFilesLines
* 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).
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-1512-207/+329
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails Doc fix in QLocale Doc for for QGestureRecognizer::create. Fix broken setCollectionFile (creating multiple models instead reusing) Enable the fast paths when converting to Rgb565 qdoc: ifdefed out all the debug code. Add missing QtScript API shims Further fix license whitespace. Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. ...
| * | SSL: Fix memleak related to local certificateMarkus Goetz2010-03-154-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6504 Task-number: QTBUG-8924 Task-number: QTBUG-5645 Reviewed-by: andreas Reviewed-by: Peter Hartmann
| * | 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.
| * | Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe.Aaron McCarthy2010-03-116-195/+285
| | |
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-152-4/+2
|\ \ \ | |/ / |/| / | |/ | | Conflicts: src/gui/styles/qs60style_s60.cpp
| * QSslKey: Do not make OpenSSL prompt for a password on stdinMarkus Goetz2010-03-151-3/+1
| | | | | | | | | | Task-number: QTBUG-2515 Reviewed-by: Andreas Aardal Hanssen
| * QHostInfo: Compile fixMarkus Goetz2010-03-081-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-079-27/+234
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * \ Merge remote branch 'staging/4.7' into bearermanagement/pollingAaron McCarthy2010-03-051-1/+1
| |\ \
| * | | Don't keep polling network sessions open indefinitely.Aaron McCarthy2010-03-054-2/+36
| | | |
| * | | Prefer ethernet over wlan.Aaron McCarthy2010-03-041-18/+51
| | | | | | | | | | | | | | | | | | | | Change how the defaultConfiguration is calculated when one is not provided by an engine.
| * | | Updating polling mechanism for bearer management engines.Aaron McCarthy2010-03-045-7/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves the polling mechanism by sharing a single timer for all poll based engines. Updates are only performed for a poll based engine iff a QNetworkConfigurationManager object has been constructed or a QNetworkConfiguration is held externally from the engine.
* | | | 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
| | | |
generated by cgit v0.12 at 2025-01-22 12:06:28 (GMT)