summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-17 02:48:07 (GMT)
committerAaron McCarthy <aaron.mccarthy@nokia.com>2010-02-17 02:48:07 (GMT)
commitd1d81d48dff6b3285d9016d8f3354630926463d8 (patch)
tree1b8e7be0d9099ba8ea9a0632b5a11cbe719f367b
parent0d950606bf2d4e8d63d552420c7517eea69b3a83 (diff)
downloadQt-d1d81d48dff6b3285d9016d8f3354630926463d8.zip
Qt-d1d81d48dff6b3285d9016d8f3354630926463d8.tar.gz
Qt-d1d81d48dff6b3285d9016d8f3354630926463d8.tar.bz2
Disable NLA plugin, build generic on win32 and mac.
The NLA plugin locks up on exit for some programs, though not all. Disable for now until cause is found. Always build generic plugin on win32 and mac.
-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 6ce1f0d..7ba62b3 100644
--- a/src/plugins/bearer/bearer.pro
+++ b/src/plugins/bearer/bearer.pro
@@ -3,9 +3,11 @@ TEMPLATE = subdirs
!maemo:contains(QT_CONFIG, dbus):contains(QT_CONFIG, networkmanager) {
SUBDIRS += networkmanager generic
}
-win32:SUBDIRS += nla
+#win32:SUBDIRS += nla
+win32:SUBDIRS += generic
win32:!wince*:SUBDIRS += nativewifi
macx:SUBDIRS += corewlan
+macx:SUBDIRS += generic
symbian:SUBDIRS += symbian
maemo6:contains(QT_CONFIG, dbus):SUBDIRS += icd