diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-31 08:29:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-08-31 08:29:08 (GMT) |
| commit | 2c6afc04de97d4ef6bcf7da098f57284f8d928e5 (patch) | |
| tree | 27f3086085ac9bcae312b12a6019ee60b59c3ee2 /src/s60installs/s60installs.pro | |
| parent | cdb689777841e40d6b017f3e57bcce62992c10b6 (diff) | |
| parent | 8a58bde27c9e23cd8a5688fdc50b6b74d25411a6 (diff) | |
| download | Qt-2c6afc04de97d4ef6bcf7da098f57284f8d928e5.zip Qt-2c6afc04de97d4ef6bcf7da098f57284f8d928e5.tar.gz Qt-2c6afc04de97d4ef6bcf7da098f57284f8d928e5.tar.bz2 | |
Merge branch '4.6'
Diffstat (limited to 'src/s60installs/s60installs.pro')
| -rw-r--r-- | src/s60installs/s60installs.pro | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index 0314958..390cc11 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -6,6 +6,7 @@ symbian: { SUBDIRS= # WARNING: Changing TARGET name will break Symbian SISX upgrade functionality + # DO NOT TOUCH TARGET VARIABLE IF YOU ARE NOT SURE WHAT YOU ARE DOING TARGET = "Qt for S60" TARGET.UID3 = 0x2001E61C VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} @@ -25,17 +26,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 = \ |