From d1d81d48dff6b3285d9016d8f3354630926463d8 Mon Sep 17 00:00:00 2001
From: Aaron McCarthy <aaron.mccarthy@nokia.com>
Date: Wed, 17 Feb 2010 12:48:07 +1000
Subject: 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.
---
 src/plugins/bearer/bearer.pro | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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
 
-- 
cgit v0.12