diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-29 10:43:36 +1000 |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-01-29 10:43:36 +1000 |
| commit | e4625e53aa893f7c59407913e743951294c7dafe (patch) | |
| tree | ed6fd93a3610a0d8e7bd9074fcd0796d1a3bc6f0 /tests/auto/qnetworksession | |
| parent | d3b580fe8b2b0c185f0eadbf794156058496eff3 (diff) | |
| parent | 1e06b5e995c6df715da8db53c8375d458277144d (diff) | |
Merge commit 'BearerIntegration-4' into bearermanagement/integration-4
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
Diffstat (limited to 'tests/auto/qnetworksession')
| -rw-r--r-- | tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro index 85aa5aa580..ffa3b252fe 100644 --- a/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro +++ b/tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro @@ -6,4 +6,10 @@ QT = core network symbian { TARGET.CAPABILITY = NetworkServices NetworkControl ReadUserData -}
\ No newline at end of file +} + +maemo6 { + CONFIG += link_pkgconfig + + PKGCONFIG += conninet +} |