summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Kling <andreas.kling@nokia.com>2011-06-10 08:57:40 (GMT)
committerAndreas Kling <andreas.kling@nokia.com>2011-06-10 08:57:40 (GMT)
commit6a166ee97ce135c107c8436a1bd6b42a39124f57 (patch)
treea0a2ce0137ae1d982e42e414684c496d03078ae9 /src
parentc017cd021bb0f3277db2165c21b62befcfe7773c (diff)
downloadQt-6a166ee97ce135c107c8436a1bd6b42a39124f57.zip
Qt-6a166ee97ce135c107c8436a1bd6b42a39124f57.tar.gz
Qt-6a166ee97ce135c107c8436a1bd6b42a39124f57.tar.bz2
Attempt to get Symbian building with SQLite.
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/webkit/Source/WebCore/WebCore.pro9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/3rdparty/webkit/Source/WebCore/WebCore.pro b/src/3rdparty/webkit/Source/WebCore/WebCore.pro
index 03cdf4e..83c1702 100644
--- a/src/3rdparty/webkit/Source/WebCore/WebCore.pro
+++ b/src/3rdparty/webkit/Source/WebCore/WebCore.pro
@@ -2613,6 +2613,15 @@ contains(DEFINES, ENABLE_SQLITE=1) {
# Build sqlite3 into WebCore from source
# somewhat copied from $$QT_SOURCE_TREE/src/plugins/sqldrivers/sqlite/sqlite.pro
SOURCES += $${SQLITE3SRCDIR}/sqlite3.c
+ } else {
+ # Use sqlite3 from the underlying OS
+ CONFIG(QTDIR_build) {
+ QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE
+ LIBS *= $$QT_LFLAGS_SQLITE
+ } else {
+ INCLUDEPATH += $${SQLITE3SRCDIR}
+ LIBS += -lsqlite3
+ }
}
SOURCES += \