summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'staging/4.7' into qtbug-12631Aaron McCarthy2010-08-043-23/+148
|\
| * new icons for cell and bt networks.Lorn Potter2010-08-031-20/+33
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-08-0321-342/+207
| |\ | | | | | | | | | | | | Conflicts: src/plugins/bearer/connman/qconnmanengine.cpp
| * | add convience methods for getting ethernet service details.Lorn Potter2010-07-302-4/+110
| | |
| * | fix spellingLorn Potter2010-07-301-1/+1
| | |
| * | fix crashLorn Potter2010-07-301-1/+1
| | |
| * | try harder to get cell nameLorn Potter2010-07-291-2/+8
| | |
* | | Fix deadlocks in ICD and NetworkManager engines.Aaron McCarthy2010-08-044-46/+41
| |/ |/| | | | | | | | | Ensure that locks are not held when signals are emitted. Task-number: QTBUG-12631
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0318-334/+185
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits) Removed the unfinished sentence. Fix for QTBUG-10173. Fixed the addressbook tutorial and some spelling mistakes. Fix for QTBUG-7071 and QTBUG-10173 Unbreak QImage::rgbSwapped() for many image formats. Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa) Doc: Adding content to installation guide and fixing printing bugs Cocoa: Active QDockWidget does not stay on top of inactive QDockWidget Made changes to qdoc to allow it to accept a "style level" flag Doc: Correcting bugs in the CSS Return 'Unknown' bearer type name for unknown bearer type. Update def files. Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. ...
| * | Simplify network manager settings code.Aaron McCarthy2010-08-021-112/+46
| | | | | | | | | | | | | | | There is no need to iterate over the outer and inner map as they are not multi-maps.
| * | Use an enum to return the bearer type of a network configuration.Aaron McCarthy2010-08-0217-222/+139
| |/ | | | | | | | | Task-number: QTBUG-12378 Reviewed-by: Alex
* | Fixed additional case differences between Gnupoc and Symbian^3.axis2010-07-304-7/+21
|/ | | | RevBy: Trust me
* Merge remote branch 'staging/4.7' into bearermanagement/icd-static-libsAaron McCarthy2010-07-287-117/+209
|\
| * Cherry pick fix for MOBILITY-1234 from Qt Mobility.Aaron McCarthy2010-07-281-0/+2
| | | | | | | | e51af0d74f8bb6ca6100d2338671d2d053bfed01
| * Cherry pick fix for QTMOBILITY-408 from Qt Mobility.Aaron McCarthy2010-07-282-33/+34
| | | | | | | | 7f9a8ebcfe86d3df428707888c3ab5fcd10226a4
| * Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-283-24/+68
| | | | | | | | f84bb604d745c512db8d53410c5fec835309f85e
| * Fix compilation error on Symbian^4.Aaron McCarthy2010-07-283-12/+12
| | | | | | | | | | The root cause is failing compilation test for SNAP when it shouldn't, but it should still not result in compilation errors in code.
| * Fix detection of OCC functionality.Aaron McCarthy2010-07-281-1/+1
| |
| * Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-283-48/+93
| | | | | | | | 2f582953ecfc53f217317f58e4fc75b5b51a1126
* | Statically link to Qt based dependent librarys.Aaron McCarthy2010-07-281-2/+5
|/ | | | | | | | | | Some of the library dependencies of the ICD Bearer Management plugin use Qt. We include them in src/3rdparty and link against them statically to avoid the circular build dependency. Libraries that do not use Qt are still linked dynamically. The libraries which are statically linked are libconninet and libgq-gconf. Task-number: QTBUG-12354
* Cherry pick fix for MOBILITY-1145 from Qt Mobility.Aaron McCarthy2010-07-271-1/+3
| | | | f17d8a5dbef076046ff504fecb1fd445c9b785ac
* Cherry pick fix for MOBILITY-1144 from Qt Mobility.Aaron McCarthy2010-07-271-2/+15
| | | | 426ff79e49d4abb659167541bb67846443b9707e
* Order network configurations in service networks in priority order.Aaron McCarthy2010-07-231-37/+46
| | | | | | | | It is useful to know the priority order of the sub configurations of a service network. Task-number: QTBUG-11678 RevBy: juhvu <qt-info@nokia.com>
* Do not crash if addrinfo signal does not contain ip address information.Jukka Rissanen2010-07-161-0/+3
| | | | | Fixes: NB#176643 - Segmentation fault occurs while using networking Reviewed-by: Adrian Constantin
* Merge branch '4.7' of ../oslo-staging-1 into 4.7Lorn Potter2010-07-145-27/+37
|\
| * Quiet qmake warnings during configure.Aaron McCarthy2010-07-082-17/+21
| | | | | | | | | | | | | | | | Configure runs qmake on all .pro files in the source tree. Wrapping symbian only code in symbian scopes prevents warnings about unset EPOCROOT on other platforms. Task-number: QTBUG-11996
| * Fix build failure with cs2009q3 toolchain.Aaron McCarthy2010-07-052-7/+7
| | | | | | | | Use Qt typedef for unsigned 32-bit integers.
| * Fix compiler warning.Aaron McCarthy2010-07-021-1/+1
| |
| * Abort if connection to DBus cannot be established.Aaron McCarthy2010-07-021-0/+5
| | | | | | | | | | | | | | Fixes network access issue when running Qt applications in scratchbox environment. Task-number: QT-3528
| * Fix build failure on Symbian^3.Aaron McCarthy2010-06-301-2/+3
| |
* | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-301-22/+33
|\ \ | |/
| * When application calls QNetworkSession::close() or QNetworkSession::stop(), ↵Jukka Rissanen2010-06-291-22/+33
| | | | | | | | | | | | make sure the disconnected signal is sent even if the actual network connection is not closed. Fixes: NB#175064 - QNetworkSession signals wrong state after calling stop()
* | make sure ap's are removed when the device is removedLorn Potter2010-06-303-28/+74
| |
* | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-275-232/+479
|\ \ | |/
| * Abort open early if network session is in the process of openning.Aaron McCarthy2010-06-242-5/+20
| |
| * Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-242-55/+37
| | | | | | | | 21abc07dc396f08c888bf3cac96b535cc296cb00
| * Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-6/+29
| | | | | | | | 4713262c16cb3eba1f4beccb6962a1ae210479c0
| * Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-51/+18
| | | | | | | | 37ad80914f7acb8d4f3364d78e75d48cd14e8e2a
| * Cherry pick fix for MOBILITY-965 from Qt Mobility.Aaron McCarthy2010-06-243-10/+147
| | | | | | | | 50de830ded2dcc1c6b4d8be71428d9a2bfed6ae7
| * Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-242-6/+29
| | | | | | | | a05504d2a0c643c6f253527f07bcc0dba8a799b4
| * Cherry pick fix for MOBILITY-853 from Qt Mobility.Aaron McCarthy2010-06-242-0/+71
| | | | | | | | 256e67963c4cb0fc150e6c47193e7c9b17296611
| * Cherry pick fix for MOBILITY-1031 from Qt Mobility.Aaron McCarthy2010-06-243-22/+29
| | | | | | | | 7e8b55524bd8a00e49e11103e8c8091e1e59e612
| * Cherry pick fix for MOBILITY-938 from Qt Mobility.Aaron McCarthy2010-06-242-54/+49
| | | | | | | | 216f4016d1b447d51630086afca179df11fd6997
| * Cherry pick fix for QTMOBILITY-240 from Qt Mobility.Aaron McCarthy2010-06-242-62/+88
| | | | | | | | c84a6d828bcb7f66d1ac06e1a7a84c5a8ba9cec4
| * Fix build on Symbian^3.Aaron McCarthy2010-06-221-0/+1
| |
* | fix actions regarding removal of connman. make tests pass on desktopLorn Potter2010-06-272-81/+91
| |
* | fix ghost ap issue, and dont block on connectLorn Potter2010-06-212-82/+235
| |
* | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-176-48/+81
|\ \ | |/
| * Fix symbian-abld build failure with bearer pluginsMiikka Heikkinen2010-06-114-2/+4
| | | | | | | | | | | | | | All different Symbian bearer plugins had same UID which caused duplicate extension makefiles. Assigned each dll different UID. Reviewed-by: Jason Barron
| * Split Symbian bearer plugin into three platform specfic pluginsAaron McCarthy2010-06-085-40/+62
| | | | | | | | | | | | | | | | Symbian bearer plugin has more functionality when built for newer platforms, so split the plugin into three platform specific plugins, and deploy the correct one depending on what the device supports. Written by: Miikka Heikkinen <miikka.heikkinen@digia.com>