Added automatic sqlite extraction for Symbian to QtWebKit.

Also added sqlite detection in case sqlite is not present in the SDK.
This is possible if WebKit is compiled standalone.

The inclusion part is a consequence of commit c578c6c1d6d in the Qt
repository. It will not work on Qt versions < 4.7.1, but that is ok,
since the only build system it will affect is marked as experimental
in the whole 4.7 series.

RevBy:    Kenneth Rohde Christiansen
Task:     https://bugs.webkit.org/show_bug.cgi?id=42744
(cherry picked from commit 9c8fe530f4068fc35a58008758ee2bc434415993)

1 files changed, 10 insertions, 2 deletions

diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro
index c1661a4..2047143 100644
--- a/src/3rdparty/webkit/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/WebCore/WebCore.pro
@@ -117,8 +117,16 @@ win32-g++* {
     QMAKE_LIBDIR_POST += $$split(TMPPATH,";")
 }
 
-# Assume that symbian OS always comes with sqlite
-symbian:!CONFIG(QTDIR_build): CONFIG += system-sqlite
+symbian {
+    !CONFIG(QTDIR_build) {
+        # Test if symbian OS comes with sqlite
+        exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso):CONFIG *= system-sqlite
+    } else:!symbian-abld:!symbian-sbsv2 {
+        # When bundled with Qt, all Symbian build systems extract their own sqlite files if
+        # necessary, but on non-mmp based ones we need to specify this ourselves.
+        include($$QT_SOURCE_TREE/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri)
+    }
+}