summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2011-01-28 12:29:47 (GMT)
committeraxis <qt-info@nokia.com>2011-01-28 12:29:52 (GMT)
commitedece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0 (patch)
tree221c64f67aeee3addfe19760322e1bd8bb2d79cd /src/plugins
parent5e3c4b6a82df640c15778af72384c6b27f8860b7 (diff)
parent8a443d2695344f26b9adf4310672e1a5fd62aeb5 (diff)
downloadQt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.zip
Qt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.tar.gz
Qt-edece4b0ce4a9a1c8d6e8d6950fd3cc5f49a9cc0.tar.bz2
Merge branch 'windowsMakefileBuildSupport' into earth-master
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