summaryrefslogtreecommitdiffstats
path: root/examples/network
Commit message (Collapse)AuthorAgeFilesLines
* Don't build bearercloud example if Qt was build w/o SVG supportAlex2010-08-111-1/+4
| | | | | Task-number: QTBUG-12791 Reviewed-by: David Laing
* fix line endingsOswald Buddenhagen2010-08-043-82/+82
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-047-76/+496
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Assistant: Include QML docs Fixed the curve descriptions and added descriptions for overshoot, amplitude, and period. Fix for QTBUG-7940. Cocoa: Showing a QFontDialog first shows it in the bottom-left corner Mac: fix regression from 65a673f that makes some buttons unclickable Fix deadlocks in ICD and NetworkManager engines. new icons for cell and bt networks. Doc: updating getting started docs - not finished Doc: removing empty links in bread crumb add convience methods for getting ethernet service details. fix spelling fix crash try harder to get cell name
| * new icons for cell and bt networks.Lorn Potter2010-08-037-76/+496
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-08-041-1/+1
|\ \ | |/ |/| | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Assigned valid UID3 for fortuneserver example
| * Assigned valid UID3 for fortuneserver exampleMiikka Heikkinen2010-08-031-1/+1
| | | | | | | | | | | | | | | | Previous UID used by fortuneserver was already assigned for anomaly demo. Task-number: QTBUG-12276 Reviewed-by: TrustMe
* | Use an enum to return the bearer type of a network configuration.Aaron McCarthy2010-08-021-10/+18
| | | | | | | | | | Task-number: QTBUG-12378 Reviewed-by: Alex
* | Rename QNetworkConfiguration::bearerName() function.Aaron McCarthy2010-08-022-13/+13
|/ | | | | | | | | | | bearerName() -> bearerTypeName(). bearerName() is deprecated and converted into an inline function which calls bearerTypeName(). This is required to keep existing code source compatible between Qt Mobility 1.0.x and Qt 4.7. Task-number: QTBUG-12378 Reviewed-by: Alex
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-301-11/+13
|\ | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix crash on Desktop platforms.
| * Fix crash on Desktop platforms.Aaron McCarthy2010-07-291-11/+13
| | | | | | | | | | | | Missing check for null networkSession. Task-number: QTBUG-12501
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-07-291-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( d521d7d81e8f0297c94be9ebd8af67ee130d0edb ) Workaround for QTBUG-8013: Do not return an ascent of 0 Fix crash when all the items in a QListView are hidden Removed QEXPECT_FAIL macros from test cases which now pass Ensure backing store is deleted before top-level window One more .pro fix for deprecated INCPATH Fix Rhys' qmake warnings Fixed QVideoSurfaceFormat::isValid()
| * Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-291-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebKit/qt/ChangeLog src/gui/itemviews/qlistview.cpp tests/auto/qlistview/tst_qlistview.cpp tests/auto/qnetworkreply/test/test.pro tests/auto/qsocks5socketengine/qsocks5socketengine.pro
| | * Fix Rhys' qmake warningsMarkus Goetz2010-07-221-1/+1
| | |
* | | Fixed spelling mistakes in documented functions, classes, etc. Part of ↵Jerome Pasion2010-07-293-13/+13
|/ / | | | | | | QTBUG-11938 and QTBUG-10801
* | Cherry pick fix for MOBILITY-1077 from Qt Mobility.Aaron McCarthy2010-07-271-0/+5
| | | | | | | | | | 7ef45318255c5cf1f10508753c9a2c55fc2cb8c0 321bd8b7b54e34a983b1ba142af836cf3e153a66
* | Show Service Network members in priority order.Aaron McCarthy2010-07-231-9/+5
| | | | | | | | | | | | | | | | | | The configurations returned from QNetworkConfiguration::children() are guaranteed to be in priority order. Ensure that this order is reflected in the tree view. Task-number: QTBUG-11678 RevBy: juhvu <qt-info@nokia.com>
* | Convert examples and demos to use Bearer Management.Aaron McCarthy2010-07-1913-604/+211
| | | | | | | | Task-number: QTBUG-10439
* | Fix build on Symbian.Aaron McCarthy2010-07-191-3/+0
| |
* | Compile fix for bearermonitor exampleDominik Holland2010-07-122-1/+49
| |
* | 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
| | | | |
generated by cgit v0.12 at 2024-08-24 20:58:51 (GMT)