diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-12 00:53:32 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-12 03:48:16 (GMT) |
| commit | aa4ab19776a67f882b901b488de8664811df8ae5 (patch) | |
| tree | f8d415e64d0615b2455069ed6427983a4f815bc0 /mkspecs | |
| parent | e1dfaf37a1411d1afaaa63684b54a443d19df7e2 (diff) | |
| download | Qt-aa4ab19776a67f882b901b488de8664811df8ae5.zip Qt-aa4ab19776a67f882b901b488de8664811df8ae5.tar.gz Qt-aa4ab19776a67f882b901b488de8664811df8ae5.tar.bz2 | |
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')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 4 | ||||
| -rw-r--r-- | mkspecs/linux-g++-maemo/qmake.conf | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 9c5bcf4..df381d2 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -8,6 +8,10 @@ QT += core gui QMAKE_INCREMENTAL_STYLE = sublib DEFINES += UNICODE QT_KEYPAD_NAVIGATION QT_SOFTKEYS_ENABLED QT_USE_MATH_H_FLOATS + +# QNetworkAccessManager to create a network session by default +DEFINES += QT_QNAM_DEFAULT_NETWORK_SESSION + QMAKE_COMPILER_DEFINES += SYMBIAN QMAKE_EXT_OBJ = .o diff --git a/mkspecs/linux-g++-maemo/qmake.conf b/mkspecs/linux-g++-maemo/qmake.conf index ca201bc..e272e72 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) |