diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-08-20 06:51:03 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-08-20 06:51:03 (GMT) |
| commit | 33419b3f6238f8f707afb9ba27b96a408e70137a (patch) | |
| tree | 484fd41166da5fc9dae67dd68493b35de25f8319 /src | |
| parent | 870701fc34dc50bb06e55467e28da66f23ace2ea (diff) | |
| parent | 790c76b57d2697b8aadc2428c252890260207144 (diff) | |
| download | Qt-33419b3f6238f8f707afb9ba27b96a408e70137a.zip Qt-33419b3f6238f8f707afb9ba27b96a408e70137a.tar.gz Qt-33419b3f6238f8f707afb9ba27b96a408e70137a.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/bearer/bearer.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro index 6d8f7f2..bbe8ab1 100644 --- a/src/plugins/bearer/bearer.pro +++ b/src/plugins/bearer/bearer.pro @@ -5,7 +5,7 @@ contains(QT_CONFIG, dbus) { SUBDIRS += icd } else { SUBDIRS += generic - !mac:SUBDIRS += connman networkmanager + linux*:SUBDIRS += connman networkmanager } } |