diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-08-31 08:40:12 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-08-31 08:40:12 (GMT) |
| commit | 734badac98a81b6a1937dc94ac52839c52eee8a9 (patch) | |
| tree | 12419f5ce18c593a843c76ad57f1f3bce9526cf1 /src/s60installs/s60installs.pro | |
| parent | 68dc7ed9338eb555eb78d9993490434284bdc223 (diff) | |
| parent | 174bef24f10242b042dad626f8b68a95bdfb7ac7 (diff) | |
| download | Qt-734badac98a81b6a1937dc94ac52839c52eee8a9.zip Qt-734badac98a81b6a1937dc94ac52839c52eee8a9.tar.gz Qt-734badac98a81b6a1937dc94ac52839c52eee8a9.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 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 = \ |