summaryrefslogtreecommitdiffstats
path: root/examples/network
Commit message (Collapse)AuthorAgeFilesLines
* Cherry pick fix for QTMOBILITY-253 from Qt Mobility.Aaron McCarthy2010-06-245-5/+5
| | | | f3d7f49b7f6975cbfa65adeb10b281e2b37172ce
* Cherry pick fix for MOBILITY-1047 from Qt Mobility.Aaron McCarthy2010-06-241-2/+9
| | | | 4f74cd44d77349759096bed091913b188a9167e4
* Merge bearermanagement changes from Qt Mobility.Aaron McCarthy2010-06-243-3/+3
| | | | cba220f177154428d6103a93a819668be689a591
* Doc: Updated example license to three clause BSD license.David Boddie2010-05-1994-2570/+2476
| | | | | Reviewed-by: Trust Me Requested-by: Legal
* Bearer management changes from Qt Mobility.Aaron McCarthy2010-05-144-4/+18
| | | | 9286bfcc43d38e0cb3bfd1d3f99ac7ab5d88b7e3
* Bearer management changes from Qt Mobility (7a5ff985)Aaron McCarthy2010-04-147-24/+630
| | | | 7a5ff9859f5775915ae80c287f51c772599c2379
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix qmake.pro after Symbian alternate build system integration Fix compile error Don't try to use so much permissions, use something a lot more sane A bit saner suggestion Remove not needed permissions Make compile on Symbian
| * Don't try to use so much permissions, use something a lot more saneThomas Zander2010-04-121-1/+1
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-04-121-8/+13
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (54 commits) Apply f176759fc41abc4cb901c2cbaa15264f2a9ac85b to stdout too. Autotest: add some debugging, just in case there's something wrong Autotest: fix the fix for the rounding error. Fix compile error with QT_NO_LIBRARY in QtMultimedia the _setmode() prototype is different on win ce qdoc: Changed qdoc to output the new doc format. Doc: update 'developing on mac' fcntl.h doesn't seem to exist, either - contrary to an example on msdn Autotest: fix paths on the test server after update. Force the repaint during a window resize. fix compile on wince remove CONFIG += ordered again Assistant: Check namespace and virtual folder syntax of help projects. QtHelp: Fix auto tests. Fix a crash when unloading libQtCore Introduce a qconfig feature for QtDBus Fix build after MR 543 merged. Compile on 10.4. revert "Fix the Qt build on Mac OS X/Cocoa 64-bit" Remove expected failures after JavaScriptCore bug fix ...
| * Allow building Qt without the QtGui moduleBernhard Rosenkraenzer2010-04-071-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a -no-gui switch to configure, allowing to build Qt without QtGui and components depending on QtGui. This is useful on headless servers, and in using QtCore, QtNetwork, QtXml, QtSql etc. on platforms QtGui hasn't been ported to yet. Task-number: QTBUG-4007 Merge-request: 543 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com> Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Fixing the missing "\\"Aleksandar Sasha Babic2010-04-081-1/+1
|/ | | | Reviewed-by: TrustMe
* Compile with QT_NO_NETWORKINTERFACE defined.Aaron McCarthy2010-03-254-6/+17
|
* Bearer management changes from Qt Mobility (6fb31d1e).Aaron McCarthy2010-03-242-2/+2
| | | | 6fb31d1e287d7def45c115eb56bcb9b0c5cb3c40.
* 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