summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-02-08 13:36:01 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-02-08 13:36:01 (GMT)
commit31cd89e8139f178e57ebb9a1b81b289b5df5fc69 (patch)
treee0143bb3db59d61e08409ef2b69ac9866d4cb840
parentb026f288a3ef5ef4ee1ed771fa464268dbbacd78 (diff)
downloadQt-31cd89e8139f178e57ebb9a1b81b289b5df5fc69.zip
Qt-31cd89e8139f178e57ebb9a1b81b289b5df5fc69.tar.gz
Qt-31cd89e8139f178e57ebb9a1b81b289b5df5fc69.tar.bz2
Disable sqlite plugin compilation on symbian by default
-rwxr-xr-xconfigure8
-rw-r--r--src/plugins/sqldrivers/sqlite/sqlite.pro2
2 files changed, 8 insertions, 2 deletions
diff --git a/configure b/configure
index dab9c40..50fcae9 100755
--- a/configure
+++ b/configure
@@ -4843,6 +4843,14 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do
fi
;;
sqlite)
+ if [ "$CFG_SQL_sqlite" = "auto" ]; then # the default
+ case "$XPLATFORM" in
+ symbian*)
+ # sqlite on symbian is typically not build in Qt but deployed as a pre-existing sis file.
+ CFG_SQL_sqlite=no
+ ;;
+ esac
+ fi
if [ "$CFG_SQL_sqlite" != "no" ]; then
SQLITE_AUTODETECT_FAILED="no"
if [ "$CFG_SQLITE" = "system" ]; then
diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro
index f24db9d..c609a9e 100644
--- a/src/plugins/sqldrivers/sqlite/sqlite.pro
+++ b/src/plugins/sqldrivers/sqlite/sqlite.pro
@@ -1,7 +1,5 @@
TARGET = qsqlite
-symbian:TARGET.UID3=0x2001E631
-
HEADERS = ../../../sql/drivers/sqlite/qsql_sqlite.h
SOURCES = smain.cpp \
../../../sql/drivers/sqlite/qsql_sqlite.cpp