diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-09-13 04:26:00 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-09-13 04:26:00 (GMT) |
| commit | b8c1712988f00d7bb2e9ca02b598a77fb2a6ff01 (patch) | |
| tree | edcbbf83f29cd9d0b4688065e786ef92a6540f4e | |
| parent | d1b522c76eb1132254f195c2f59bd5d55cd2f525 (diff) | |
| download | Qt-b8c1712988f00d7bb2e9ca02b598a77fb2a6ff01.zip Qt-b8c1712988f00d7bb2e9ca02b598a77fb2a6ff01.tar.gz Qt-b8c1712988f00d7bb2e9ca02b598a77fb2a6ff01.tar.bz2 | |
Don't add generic subdirs project twice.
Task-number: QTBUG-13519
| -rw-r--r-- | src/plugins/bearer/bearer.pro | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro index bbe8ab1..d1d75f0 100644 --- a/src/plugins/bearer/bearer.pro +++ b/src/plugins/bearer/bearer.pro @@ -3,9 +3,9 @@ TEMPLATE = subdirs contains(QT_CONFIG, dbus) { contains(QT_CONFIG, icd) { SUBDIRS += icd - } else { + } else:linux* { SUBDIRS += generic - linux*:SUBDIRS += connman networkmanager + SUBDIRS += connman networkmanager } } @@ -16,4 +16,4 @@ macx:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan macx:SUBDIRS += generic symbian:SUBDIRS += symbian -isEmpty(SUBDIRS):SUBDIRS += generic +isEmpty(SUBDIRS):SUBDIRS = generic |