summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-11-02 13:35:56 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-11-02 13:50:35 (GMT)
commit298e0d28106fd7ef3fe7232c71dd05a57b5d1d90 (patch)
tree6a4187cc1cabb632d7e7cd9c0fc392d3b76053a6 /src
parent56da3aca1fc8a7c269acf3cf1d4c3586ea8cdfd7 (diff)
downloadQt-298e0d28106fd7ef3fe7232c71dd05a57b5d1d90.zip
Qt-298e0d28106fd7ef3fe7232c71dd05a57b5d1d90.tar.gz
Qt-298e0d28106fd7ef3fe7232c71dd05a57b5d1d90.tar.bz2
Re-added checking for existence of sqlite3 binaries to Symbian builds
Always adding export for sqlite3 binaries will cause cleanup of platform provided versions on platforms that provide them. Fixed by adding check for existence of sqlite3.dso before adding the export statement to bld.inf. Task-number: QT-2419 Reviewed-by: Janne Koskinen
Diffstat (limited to 'src')
-rw-r--r--src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
index 4734144..158633d 100644
--- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
+++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro
@@ -1,5 +1,7 @@
# Use subdirs template to suppress generation of unnecessary files
TEMPLATE = subdirs
-# We just want to extract the zip file containing sqlite binaries for Symbian
-BLD_INF_RULES.prj_exports += ":zip SQLite3_v9.2.zip"
+# We just want to export the sqlite3 binaries for Symbian for platforms that do not have them.
+!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) {
+ BLD_INF_RULES.prj_exports += ":zip SQLite3_v9.2.zip"
+}