diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 07:28:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-31 07:28:23 (GMT) |
| commit | 4f933036a0ecbc6e6174b312ec2fd6078cea5b70 (patch) | |
| tree | 2359dbf112a07a005f913aa46765bbf52b8bff95 /src/plugins | |
| parent | 1e48d40597bbe12321a5a3e42b3595dc17a7f8e7 (diff) | |
| parent | dffa9fdeae46974aab53a502af257a83ec319b1b (diff) | |
| download | Qt-4f933036a0ecbc6e6174b312ec2fd6078cea5b70.zip Qt-4f933036a0ecbc6e6174b312ec2fd6078cea5b70.tar.gz Qt-4f933036a0ecbc6e6174b312ec2fd6078cea5b70.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging:
Fix Symbian system date format parsing.
Fix QXmlSimpleReader auto test failer
Fix pointer event mapping when windows are fixed to native orientation
Fix incorrect Symbian version check.
Fix BLD_INF_RULES.prj_exports statements in Qt libs for shadow builds.
Improved support for shadow builds in Symbian.
Fix def file paths for Symbian shadow builds
Giving QUuid::createUuid() more entropy on Symbian
Enable running of XQuery test suite
QXmlSimpleReader handle external entity reference file over 1k
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro index 0d233e6..382217a 100644 --- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro +++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pro @@ -4,6 +4,8 @@ TEMPLATE = subdirs # We just want to export the sqlite3 binaries for Symbian for platforms that do not have them. symbian-abld|symbian-sbsv2 { !symbian_no_export_sqlite:!exists($${EPOCROOT}epoc32/release/armv5/lib/sqlite3.dso) { - BLD_INF_RULES.prj_exports += ":zip SQLite3_v9.2.zip" + # Symbian exports do not like drive letter, so remove it from the source dir + SQLITE_SRC_DIR = $$relativeProPath() + BLD_INF_RULES.prj_exports += ":zip $$SQLITE_SRC_DIR/SQLite3_v9.2.zip" } } |