diff -r 5dc02b23752f -r 3e2da88830cd src/s60installs/qt.pkg --- a/src/s60installs/qt.pkg Tue Jul 06 15:10:48 2010 +0300 +++ b/src/s60installs/qt.pkg Wed Aug 18 10:37:55 2010 +0300 @@ -6,7 +6,7 @@ &EN ; SIS header: name, uid, version -#{"Qt"},(0x2001E61C),4,6,2,TYPE=SA,RU +#{"Qt"},(0x2001E61C),4,7,0,TYPE=SA,RU ; Manual PKG pre-rules from PRO files ; Default HW/platform dependencies @@ -33,10 +33,10 @@ "/epoc32/release/armv5/urel/QtSql.dll" - "!:\sys\bin\QtSql.dll" "/epoc32/release/armv5/urel/QtSvg.dll" - "!:\sys\bin\QtSvg.dll" "/epoc32/release/armv5/urel/QtScript.dll" - "!:\sys\bin\QtScript.dll" -"/epoc32/release/armv5/urel/QtWebKit.dll" - "!:\sys\bin\QtWebKit.dll" "/epoc32/release/armv5/urel/QtOpenVG.dll" - "!:\sys\bin\QtOpenVG.dll" "/epoc32/release/armv5/urel/phonon.dll" - "!:\sys\bin\phonon.dll" "/epoc32/release/armv5/urel/QtMultimedia.dll" - "!:\sys\bin\QtMultimedia.dll" +"/epoc32/release/armv5/urel/QtDeclarative.dll" - "!:\sys\bin\QtDeclarative.dll" "/epoc32/release/armv5/urel/QtXmlPatterns.dll" - "!:\sys\bin\QtXmlPatterns.dll" "/epoc32/release/armv5/urel/qjpeg.dll" - "!:\sys\bin\qjpeg.dll" @@ -74,8 +74,3 @@ ELSE "/epoc32/release/armv5/urel/qts60plugin_5_0.dll" - "!:\sys\bin\qts60plugin_5_0.dll" ENDIF - -; 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