diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-17 09:49:05 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-17 10:38:45 (GMT) |
| commit | 9d9fc57b4af91eab681abb07c0924c71c1374537 (patch) | |
| tree | 5f0cf11942d8f9e2aecf5ee350a095c6a3d078f8 /src/plugins/bearer | |
| parent | 616d84ddb2a07191d2754b0f3e7296cae472b738 (diff) | |
| download | Qt-9d9fc57b4af91eab681abb07c0924c71c1374537.zip Qt-9d9fc57b4af91eab681abb07c0924c71c1374537.tar.gz Qt-9d9fc57b4af91eab681abb07c0924c71c1374537.tar.bz2 | |
Remove pre-Symbian3 plugins from Symbian3 and later builds
Symbian3 and later builds are not compatible with pre-Symbian3 phones
anyway, so no need to build and deploy older version plugins when
building for Symbian3 or later.
Task-number: QT-3949
Reviewed-by: Janne Koskinen
Diffstat (limited to 'src/plugins/bearer')
| -rw-r--r-- | src/plugins/bearer/symbian/symbian.pri | 6 | ||||
| -rw-r--r-- | src/plugins/bearer/symbian/symbian.pro | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/plugins/bearer/symbian/symbian.pri b/src/plugins/bearer/symbian/symbian.pri index 9b3f50c..e874945 100644 --- a/src/plugins/bearer/symbian/symbian.pri +++ b/src/plugins/bearer/symbian/symbian.pri @@ -22,11 +22,9 @@ LIBS += -lcommdb \ -lnetmeta is_using_gnupoc { - LIBS += -lconnmon \ - -lapsettingshandlerui + LIBS += -lconnmon } else { - LIBS += -lConnMon \ - -lApSettingsHandlerUI + LIBS += -lConnMon } QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/bearer diff --git a/src/plugins/bearer/symbian/symbian.pro b/src/plugins/bearer/symbian/symbian.pro index f320eb6..91f8217 100644 --- a/src/plugins/bearer/symbian/symbian.pro +++ b/src/plugins/bearer/symbian/symbian.pro @@ -1,3 +1,8 @@ TEMPLATE = subdirs -SUBDIRS += 3_1 3_2 symbian_3
\ No newline at end of file +contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { + SUBDIRS += 3_1 3_2 +} + +# Symbian3 builds the default plugin for winscw so it is always needed +SUBDIRS += symbian_3
\ No newline at end of file |