summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorTasuku Suzuki <tasuku.suzuki@nokia.com>2010-04-15 05:59:08 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-04-15 05:59:08 (GMT)
commit3925bab16a88822fcef749cb6ba7c542688c2fae (patch)
treed1aa68416cf61baef54b787dc53ad3ad52bd78a1 /src/corelib/global
parent86b483104fa1e8c1b2bcd255f9b94992d1d1b864 (diff)
downloadQt-3925bab16a88822fcef749cb6ba7c542688c2fae.zip
Qt-3925bab16a88822fcef749cb6ba7c542688c2fae.tar.gz
Qt-3925bab16a88822fcef749cb6ba7c542688c2fae.tar.bz2
Introduce a qconfig feature for Bearer Management
Merge-request: 517 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qfeatures.h5
-rw-r--r--src/corelib/global/qfeatures.txt8
2 files changed, 13 insertions, 0 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 74fa8ee..c66047a 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -505,6 +505,11 @@
#define QT_NO_XMLSTREAMWRITER
#endif
+// Bearer Management
+#if !defined(QT_NO_BEARERMANAGEMENT) && (defined(QT_NO_LIBRARY))
+#define QT_NO_BEARERMANAGEMENT
+#endif
+
// Context menu
#if !defined(QT_NO_CONTEXTMENU) && (defined(QT_NO_MENU))
#define QT_NO_CONTEXTMENU
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index 0053556..ed173b1 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -1098,6 +1098,14 @@ Requires: TEMPORARYFILE
Name: QNetworkDiskCache
SeeAlso: ???
+Feature: BEARERMANAGEMENT
+Description: Provides bearer management support
+Section: Networking
+Requires: LIBRARY
+Name: Bearer Management
+SeeAlso: ???
+
+
# Utilities
Feature: COMPLETER