summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2010-12-23 15:24:57 (GMT)
committeraxis <qt-info@nokia.com>2011-03-04 10:43:26 (GMT)
commita298545dfbd9bbfeac67ff17547d40acae8480a9 (patch)
tree9a86b499be5c2a6d0e9854f5c070d47a88a44880 /src/plugins
parent5624b39aff84ddde76a4f42ab6fad9d6a90d8526 (diff)
downloadQt-a298545dfbd9bbfeac67ff17547d40acae8480a9.zip
Qt-a298545dfbd9bbfeac67ff17547d40acae8480a9.tar.gz
Qt-a298545dfbd9bbfeac67ff17547d40acae8480a9.tar.bz2
Fixed a build library deployment issue in sqlite.
Make did not understand that sqlite3.dso, which the link relies on, is the same as $$OBJECTS_DIR/sqlite3.dso, which is extracted by the profile. RevBy: Trust me
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri
index ebeccc9..b7a87f3 100644
--- a/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri
+++ b/src/plugins/sqldrivers/sqlite_symbian/sqlite_symbian.pri
@@ -34,6 +34,12 @@
silent:symbian_sqlite3_dso.commands = @echo unzipping $@ && $$symbian_sqlite3_dso.commands
QMAKE_EXTRA_COMPILERS += symbian_sqlite3_dso
+ # Workaround for the fact that make doesn't understand that sqlite3.dso
+ # is the same as $OBJECTS_DIR/sqlite3.dso
+ symbian_sqlite3_dso_standalone.target = sqlite3.dso
+ symbian_sqlite3_dso_standalone.depends = $$symbian_sqlite3_dso.output
+ QMAKE_EXTRA_TARGETS += symbian_sqlite3_dso_standalone
+
symbian_sqlite3_ver_dso.input = symbian_sqlite3_zip_file
symbian_sqlite3_ver_dso.output = sqlite3{00060003}.dso
!isEmpty(OBJECTS_DIR):symbian_sqlite3_ver_dso.output = $$OBJECTS_DIR/$$symbian_sqlite3_ver_dso.output