From 8f5c1dd293b046e7f51d12b767464345c253943f Mon Sep 17 00:00:00 2001 From: Aaron McCarthy Date: Wed, 3 Feb 2010 11:02:23 +1000 Subject: Don't build generic bearer engine on Symbian. --- src/plugins/bearer/bearer.pro | 7 +++---- src/s60installs/s60installs.pro | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro index ab0a816..7347735 100644 --- a/src/plugins/bearer/bearer.pro +++ b/src/plugins/bearer/bearer.pro @@ -1,10 +1,9 @@ TEMPLATE = subdirs -!maemo { -SUBDIRS += generic -contains(QT_CONFIG, dbus):contains(QT_CONFIG, networkmanager):SUBDIRS += networkmanager +!maemo:contains(QT_CONFIG, dbus):contains(QT_CONFIG, networkmanager):SUBDIRS += networkmanager win32:SUBDIRS += nla win32:!wince*:SUBDIRS += nativewifi macx:SUBDIRS += corewlan symbian:SUBDIRS += symbian -} + +isEmpty(SUBDIRS):SUBDIRS += generic diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index b763786..d0bd59e 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -121,7 +121,7 @@ symbian: { } bearer_plugins.path = c:$$QT_PLUGINS_BASE_DIR/bearer - bearer_plugins.sources += qgenericbearer.dll qsymbianbearer.dll + bearer_plugins.sources += qsymbianbearer.dll BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)" BLD_INF_RULES.prj_exports += "qtdemoapps.iby $$CORE_APP_LAYER_IBY_EXPORT_PATH(qtdemoapps.iby)" -- cgit v0.12