diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-12-23 12:17:59 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2009-12-23 12:40:42 (GMT) |
| commit | 5f7b681661d8067b3fd954f04b7a25d833f5c92a (patch) | |
| tree | 14380cba8d10ea6018aee852519b1cee0f7b7473 /src/plugins/sqldrivers | |
| parent | a1e716d5683261624be40b9cfaea96048ed40cd5 (diff) | |
| download | Qt-5f7b681661d8067b3fd954f04b7a25d833f5c92a.zip Qt-5f7b681661d8067b3fd954f04b7a25d833f5c92a.tar.gz Qt-5f7b681661d8067b3fd954f04b7a25d833f5c92a.tar.bz2 | |
Changed autodetection logic for stlport version and sqlite in Symbian
To support building Qt as part of Symbian SDK where epoc32 is not yet
populated, changed the autodetection logic in determining stlport
version. Now, we assume that we want the new version, unless only the
old version exists on SDK already.
Sqlite binaries export autodetection is now skipped if CONFIG value
symbian_no_export_sqlite exists, allowing clean builds to explicitly
suppress exporting.
Task-number: QTBUG-6971
Reviewed-by: axis
Diffstat (limited to 'src/plugins/sqldrivers')
| -rw-r--r-- | src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro index 9687908..691cce1 100644 --- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro +++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs # We just want to export the sqlite3 binaries for Symbian for platforms that do not have them. symbian { - !exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) { + !symbian_no_export_sqlite:!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) { BLD_INF_RULES.prj_exports += ":zip SQLite3_v9.2.zip" } } |