diff options
| author | axis <qt-info@nokia.com> | 2010-07-21 14:23:43 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-07-21 14:23:43 (GMT) |
| commit | ccfb67704285f60ce31bb05538f08ca6f32c6f1d (patch) | |
| tree | 1b90180dfe6900b8d36c7f33bf8bbc2b10bf33fb /src/3rdparty | |
| parent | 11d626de5fd87fc8cbd9d685bde8217c7ad7fae6 (diff) | |
| parent | ae64f51f092d7ffb20cb50b0e9cd9b019c0e8831 (diff) | |
| download | Qt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.zip Qt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.tar.gz Qt-ccfb67704285f60ce31bb05538f08ca6f32c6f1d.tar.bz2 | |
Merge branch 'raptorConfigurePatches' into 4.7-s60
Conflicts:
configure
src/sql/drivers/drivers.pri
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 12 |
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) + } +} |