summaryrefslogtreecommitdiff
path: root/mkspecs/linux-g++-maemo
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-12 10:53:32 +1000
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-03-12 13:48:16 +1000
commitaa4ab19776a67f882b901b488de8664811df8ae5 (patch)
treef8d415e64d0615b2455069ed6427983a4f815bc0 /mkspecs/linux-g++-maemo
parente1dfaf37a1411d1afaaa63684b54a443d19df7e2 (diff)
downloadqt4-tools-aa4ab19776a67f882b901b488de8664811df8ae5.tar.gz
Only enable BM by default in QNAM for appropriate platforms.
Bearer Management is of little use on desktop platforms. Change QNetworkAccessManager to only create a QNetworkSession for the default configuration on platorms where it is useful (Symbian & Maemo). On other platforms Bearer Management is still available, but needs to be explicitly enabled by the application developer by calling QNetworkAccessManager::setConfiguration(). Use of Bearer Management by default from QNetworkAccessManager is controlled by the QT_QNAM_BEARERMANAGEMENT_ENABLED define.
Diffstat (limited to 'mkspecs/linux-g++-maemo')
-rw-r--r--mkspecs/linux-g++-maemo/qmake.conf3
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf
index ca201bcc24..e272e72525 100644
--- a/mkspecs/linux-g++-maemo/qmake.conf
+++ b/mkspecs/linux-g++-maemo/qmake.conf
@@ -33,4 +33,7 @@ DEFINES += QT_GL_NO_SCISSOR_TEST
# Work round SGX 1.4 driver bug (text corrupted), modify glyph cache width:
DEFINES += QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024
+# QNetworkAccessManager to create a network session by default
+DEFINES += QT_QNAM_DEFAULT_NETWORK_SESSION
+
load(qt_config)