| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Replace Nokia contact email address with Qt Project website.
- Remove "All rights reserved" line from license headers.
As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.
Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
|
|
|
| |
(4.7-generated-declarative branch).
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
|
| |
Use the correct ui file when building in scratchbox.
Remove use of message boxes.
|
|
|
|
|
| |
Task-number: QTBUG-14484
Reviewed-by: Marius Storm-Olsen
|
|
|
|
|
|
|
| |
Bearermonitor example
Merge-request: 827
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
| |
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>
|
| |
|
|
|
|
| |
f3d7f49b7f6975cbfa65adeb10b281e2b37172ce
|
|
|
|
| |
4f74cd44d77349759096bed091913b188a9167e4
|
|
|
|
| |
cba220f177154428d6103a93a819668be689a591
|
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
|
|
|
| |
9286bfcc43d38e0cb3bfd1d3f99ac7ab5d88b7e3
|
|
|
|
| |
7a5ff9859f5775915ae80c287f51c772599c2379
|
| |
|
|
|
|
| |
6fb31d1e287d7def45c115eb56bcb9b0c5cb3c40.
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
|\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| | |
|
| | |
|
|/ |
|
|
|