summaryrefslogtreecommitdiffstats
path: root/examples/network
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60axis2010-03-163-3/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-03-153-3/+4
| |\ | | | | | | | | | | | | Conflicts: src/gui/styles/qs60style_s60.cpp
| | * Fix build break caused by undefined symbol SetDialogPreferenceMiikka Heikkinen2010-03-103-3/+4
| | | | | | | | | | | | | | | | | | | | | A recent sym_iap_util.h change make it depend on different libraries. Fixed LIBS statements on relevant examples and demos. Reviewed-by: Janne Anttila
* | | Fix build break caused by undefined symbol SetDialogPreferenceMiikka Heikkinen2010-03-113-3/+3
| | | | | | | | | | | | | | | | | | | | | A recent sym_iap_util.h change make it depend on different libraries. Fixed LIBS statements on relevant examples and demos. Reviewed-by: Janne Anttila
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-5/+11
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-5/+11
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * If no IAP defined force IAP dialogAleksandar Sasha Babic2010-03-051-5/+11
| | | | | | | | | | | | | | | | | | Using TCommDbConnPref to force IAP dialog when IAP is not defined Reviewed-by: TrustMe
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-0124-75/+3181
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-264-74/+89
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
| | * Port http example to QNetworkAccessManagerMarkus Goetz2010-02-223-71/+82
| | | | | | | | | | | | | | | | | | QHttp. Must. Die. Reviewed-by: Peter Hartmann
| | * loopback network example: Make use of bytesToWrite()Markus Goetz2010-02-211-3/+7
| | | | | | | | | | | | Reviewed-by: TrustMe
| * | Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-1110-13/+16
| |\ \ | | |/ | | | | | | | | | Conflicts: src/s60installs/s60installs.pro
| * | Display session statistics.Aaron McCarthy2010-02-083-4/+69
| | |
| * | Merge commit 'origin/4.6' into bearermanagement/integration-4Aaron McCarthy2010-01-2984-84/+84
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/painting/qpainter.cpp src/s60installs/s60installs.pro
| * \ \ Merge commit 'BearerIntegration-4' into bearermanagement/integration-4Aaron McCarthy2010-01-293-211/+219
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/unix/networkmanager/networkmanager.pro src/network/bearer/bearer.pro src/network/bearer/qnetworkconfiguration_s60_p.cpp tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
| | * | | Bearer Management Integration 4.Aaron McCarthy2010-01-293-211/+219
| | | | |
| * | | | Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2Aaron McCarthy2010-01-0513-32/+25
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: config.tests/mac/corewlan/corewlan.pro examples/network/bearercloud/bearercloud.pro examples/network/bearermonitor/bearermonitor.pro src/network/bearer/bearer.pro src/network/bearer/qnativewifiengine_win.cpp src/network/bearer/qnetworkconfigmanager_p.cpp src/network/bearer/qnetworkconfiguration_s60_p.cpp src/network/bearer/qnetworksession.cpp src/network/bearer/qnetworksession_p.cpp src/network/bearer/qnmwifiengine_unix.cpp src/network/bearer/qnmwifiengine_unix_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/bearer/generic/qgenericengine.cpp src/plugins/bearer/nla/main.cpp src/plugins/bearer/nla/qnlaengine.cpp tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro tests/auto/qnetworksession/lackey/lackey.pro tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro tests/manual/bearerex/bearerex.pro tests/manual/networkmanager/networkmanager.pro
| | * | | Fix up license headers.Aaron McCarthy2009-12-2210-10/+10
| | | | |
| | * | | Make compile.Aaron McCarthy2009-12-227-40/+14
| | | | |
| * | | | Bearer Management Integration 2.Aaron McCarthy2010-01-045-28/+26
| |/ / /
| * | | Bearer Management Integration 1.Aaron McCarthy2009-12-2219-0/+3027
| | | |
* | | | use the proper QMake option to find a shared header fileThomas Zander2010-02-123-3/+3
| |_|/ |/| |
* | | optimization: get rid of QString::fromUtf16() usageOswald Buddenhagen2010-02-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QString::fromUtf16() is slow - it does a BOM check and optionally byte swapping, which is utterly pointless when converting internal data structures which are raw utf16 in host byte order anyway. so replace it with QString::fromRawData() (for short-lived strings) or QString(const QChar *, int) (otherwise) if possible. Reviewed-by: axis Reviewed-by: mariusSO Reviewed-by: Bill King
* | | googlesuggest example: Add newline to end of fileMarkus Goetz2010-01-282-2/+4
| | | | | | | | | | | | Reviewed-by: TrustMe
* | | Core classes, examples, demos: Some changes from string to charMarkus Goetz2010-01-287-10/+11
| |/ |/| | | | | Reviewed-by: Peter Hartmann
* | Update copyright year to 2010Jason McDonald2010-01-0684-84/+84
|/ | | | Reviewed-by: Trust Me
* Fix Broadcast receiver example.Jedrzej Nowacki2009-11-251-1/+1
| | | | | | | | | | | The broadcast receiver should share the port number. In most cases users won't run the example on a network, but only on one machine. In the case it simply should work too. According to our documentation the fix is platform specific, it will work only on Linux. Reviewed-by: Peter Hartmann
* Ran the script utils/normalizeOlivier Goffart2009-11-1811-59/+59
| | | | Over src/ tools/ examples/ and demos/
* Merge commit 'coreteam/4.6' into oslo1-4.6Marius Storm-Olsen2009-11-134-4/+25
|\
| * Merge branch '4.6' into core-4.6Thiago Macieira2009-11-094-27/+46
| |\
| * | network examples: unify the fortune server/client examplesPeter Hartmann2009-11-094-4/+25
| | | | | | | | | | | | | | | | | | | | | always use the first non-localhost IP address to listen/connect to, if there is one. Reviewed-by: Markus Goetz
* | | Compile securesocketclient example also with openssl-linkedMarkus Goetz2009-11-131-0/+1
| |/ |/| | | | | | | Task-number: QTBUG-5742 Reviewed-by: andreas
* | ÿþdMorten Engvoldsen2009-11-094-27/+46
|/
* Emulator IAP fix for SymbianJanne Koskinen2009-10-261-0/+4
| | | | | | | Don't display multiple useless IAP dialogs in the emulator environment. If you need specific IAP then you need to revert this commit. Reviewed-by: Aleksandar Babic
* Fix build on Symbian: make sure sym_iap_util.h can be found.Frans Englich2009-10-093-3/+3
| | | | | | | | Amend commit faef2f5101287ad8ce94cf8e7a4d574a7d6267fd, with this build fix. Task-number: QTBUG-4743 Reviewed-by: Shane Kearns
* Symbian fix: rename examples ftp and musicplayer to start with q.Frans Englich2009-10-0910-5/+5
| | | | | | | | | | | | | | | | Symbian already has the executables musicplayer.exe, mediaplayer.exe and ftp.exe, with the result that we overwrite them with Qt. We solve this by renaming the examples, and do it not only on Symbian, such that Qt remains consistent across platforms. This was previously partly done for mediaplayer. The folder name needs to be consistent with the executable, for qtdemo to work. Done jointly with Alessandro. Task-number: QTBUG-4743 Reviewed-by: Alessandro Portale Reviewed-by: Frans Englich
* Demos and applications have a nice Qt logo when installed on SymbianEspen Riskedal2009-10-023-3/+3
| | | | | | | | | | Added a line to the symbianpkgrules.pri files which includes an ICON if the TARGET.UID3 is defined. We should fix the application_icon.prf to handle ICON without UID3 situations more gracefully, but for now I reordered existing UID3s to be specified before the symbianpkgrules.pri includes. Reviewed-by: Aleksandar Babic
* Threaded Fortune server example: fix displayed IPPeter Hartmann2009-10-012-3/+14
| | | | | | | listen to the first non-local IPv4 address found, as in commit 5e3775ae4c5263a25e63868e8a3f16244e4dde02 Reviewed-by: Aleksandar Babic
* Update license headers again.Jason McDonald2009-09-0984-336/+336
| | | | Reviewed-by: Trust Me
* FortuneServer/Client example: fix displayed IPPeter Hartmann2009-09-032-8/+26
| | | | | | | | fortune server: listen to the first non-local IPv4 address found, fortune client: display that address as default in the line edit. Reviewed-by: Prasanth Ullattil Reviewed-by: Aleksandar Sasha Babic
* 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-3183-1079/+1079
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3183-1079/+1079
| | | | | | | | Reviewed-by: Trust Me
| * Update URL for Qt FTP site.Jason McDonald2009-08-111-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1183-83/+83
| | | | | | | | Reviewed-by: Trust Me
* | Examples: Warn about usage of QHttpMarkus Goetz2009-08-242-0/+2
| | | | | | | | | | | | | | This is an intermediate solution until the examples have been ported to using QNetworkAccessManager. Reviewed-by: TrustMe
* | renamed examplebase.pri to symbianpkgrules.priEspen Riskedal2009-08-2115-23/+20
| | | | | | | | | | | | | | | | examplesbase.pri sounded to generic and it was not obvious that this was only for Symbian. Also merged the different symbian rules if they were spread around in the .pro file. Reviewed-by: Aleksandar Sasha Babic
* | Remove commented-out code from examples.axis2009-08-211-4/+0
| | | | | | | | RevBy: Trust me
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-08-191-4/+3
|\ \ | | | | | | | | | | | | Conflicts: tests/auto/auto.pro
| * | Added two convenience functions to QXmlStreamReaderThorbjørn Lindeijer2009-08-181-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QXmlStreamReader::readNextStartElement reads until the next start element within the current element, or returns false when no such element is encountered before the end element is reached. It simplifies the common case of iterating over the elements in an XML document. QXmlStreamReader::skipCurrentElement reads until the end element of the current element, skipping any child elements. This functionality was requested in two tasks, and a similar function 'readUnknownElement' was present in Qt's stream reader example. Autotest is included, example and documentation have been updated. Task-number: 238793 Reviewed-by: mae
generated by cgit v0.12 at 2024-12-11 09:29:18 (GMT)