summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-16 00:17:48 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-16 00:17:48 (GMT)
commit6ade9920551f16154dda548041b5ba7bbddf78eb (patch)
tree903966447155cc833887f0271978d1c097318ed4 /src
parentf8c5151b96a6c1961e90fd3162975357cac3f06b (diff)
downloadQt-6ade9920551f16154dda548041b5ba7bbddf78eb.zip
Qt-6ade9920551f16154dda548041b5ba7bbddf78eb.tar.gz
Qt-6ade9920551f16154dda548041b5ba7bbddf78eb.tar.bz2
Always build generic plugin when building NetworkManager plugin.
Diffstat (limited to 'src')
-rw-r--r--src/plugins/bearer/bearer.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro
index 95c9851..6ce1f0d 100644
--- a/src/plugins/bearer/bearer.pro
+++ b/src/plugins/bearer/bearer.pro
@@ -1,6 +1,8 @@
TEMPLATE = subdirs
-!maemo:contains(QT_CONFIG, dbus):contains(QT_CONFIG, networkmanager):SUBDIRS += networkmanager
+!maemo:contains(QT_CONFIG, dbus):contains(QT_CONFIG, networkmanager) {
+ SUBDIRS += networkmanager generic
+}
win32:SUBDIRS += nla
win32:!wince*:SUBDIRS += nativewifi
macx:SUBDIRS += corewlan