diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 07:38:16 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-31 07:38:16 (GMT) |
| commit | 3f44ecdaa7366a69545f331a20988f7753158123 (patch) | |
| tree | f12d5699168906b7eaa0c366e1bbf4098cab8c1f | |
| parent | eb80f2386d91e9bde23fc752ad25967e99cc10dc (diff) | |
| download | Qt-3f44ecdaa7366a69545f331a20988f7753158123.zip Qt-3f44ecdaa7366a69545f331a20988f7753158123.tar.gz Qt-3f44ecdaa7366a69545f331a20988f7753158123.tar.bz2 | |
Removed hard-coded sqlite3 deployment statement - used PKG conditions.
Before this change Qt did not install to device which had sqlite3
already in ROM. Since we now install the sqlite3 only if it is not on
any drive, the installation works also with preinstalled sqlite.
Even better appraoch would be to use embedded SIS file for sqlite,
since that would allow sqlite3 upgrade without upgrading the whole Qt.
However we yet don't have such SIS, but once we get one from Symbian
this needs to be further changed.
Task-number: 258858
Reviewed-by: Miikka Heikkinen
| -rw-r--r-- | src/s60installs/s60installs.pro | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 0314958..d691dd5 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -25,17 +25,13 @@ symbian: { qts60plugin_5_0.dll - # TODO: This should be conditional in PKG file, see commented code below - # However we don't yet have such mechanism in place - contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { - contains(CONFIG, system-sqlite): qtlibraries.sources += sqlite3.dll - } - - #; EXISTS statement does not resolve !. Lets check the most common drives - #IF NOT EXISTS("c:\sys\bin\sqlite3.dll") AND NOT EXISTS("e:\sys\bin\sqlite3.dll") AND NOT EXISTS("z:\sys\bin\sqlite3.dll") - #"\Epoc32\release\armv5\UREL\sqlite3.dll"-"!:\sys\bin\sqlite3.dll" - #ENDIF - + sqlitedeployment = \ + "; EXISTS statement does not resolve!. Lets check the most common drives" \ + "IF NOT EXISTS(\"c:\\sys\\bin\\sqlite3.dll\") AND NOT EXISTS(\"e:\\sys\\bin\\sqlite3.dll\") AND NOT EXISTS(\"z:\\sys\\bin\\sqlite3.dll\")" \ + "\"$${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET)/sqlite3.dll\"-\"!:\\sys\\bin\\sqlite3.dll\"" \ + "ENDIF" + qtlibraries.pkg_postrules = sqlitedeployment + qtlibraries.path = /sys/bin vendorinfo = \ |