Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (28 commits)
  Remove license headers from .pro files in new modelview examples.
  Doc: Added license documentation for 3rd party code and data.
  Do not crash if addrinfo signal does not contain ip address information.
  Link to the unsinstalled libraries first.
  Doc: Excluded the QML documentation from the Qt-only set.
  Doc: Whitespace fixes.
  Doc: Fixed whitespace issues.
  Revert the change in applicationShouldTerminate().
  Added LatinAmericaAndTheCaribbean country to the doc.
  Network Proxy Query: Fix memleak on OS X
  Doc: Reviewed Michael's model/view tutorial and overview document.
  Doc: Removed accidentally committed file.
  Doc: Fixed incorrect QML property type.
  new image for tutorial.qdoc
  replaced image, license headers, more links in modelview.qdoc file
  Doc: Added the standard three clause BSD license header.
  I've cleaned up the qdoc file a bit.
  correction of snippet tags
  integrating modelview tutorial in the build system, first attempt
  new version of modelview.qdoc with snippets
  ...

1 files changed, 2 insertions, 1 deletions

diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro
index f95e8af..6d8f7f2 100644
--- a/src/plugins/bearer/bearer.pro
+++ b/src/plugins/bearer/bearer.pro
@@ -4,7 +4,8 @@ contains(QT_CONFIG, dbus) {
     contains(QT_CONFIG, icd) {
         SUBDIRS += icd
     } else {
-        SUBDIRS += networkmanager generic
+        SUBDIRS += generic
+        !mac:SUBDIRS += connman networkmanager 
     }
 }