diff -r b5b118452c7d -r 68d3b337861b src/s60installs/qt.pkg --- a/src/s60installs/qt.pkg Mon Apr 19 10:15:19 2010 +0300 +++ b/src/s60installs/qt.pkg Wed Apr 21 09:15:16 2010 +0300 @@ -1,12 +1,8 @@ -; Qt_template.pkg generated by qmake at 2009-11-16T11:44:16 -; This file is generated by qmake and should not be modified by the user -; - ; Language &EN ; SIS header: name, uid, version -#{"Qt"},(0x2001E61C),4,6,2,TYPE=SA,RU +#{"Qt"},(0x2001E61C),4,6,3,TYPE=SA,RU ; Manual PKG pre-rules from PRO files ; Default HW/platform dependencies @@ -32,12 +28,11 @@ "/epoc32/release/armv5/urel/QtTest.dll" - "!:\sys\bin\QtTest.dll" "/epoc32/release/armv5/urel/QtSql.dll" - "!:\sys\bin\QtSql.dll" "/epoc32/release/armv5/urel/QtSvg.dll" - "!:\sys\bin\QtSvg.dll" +"/epoc32/release/armv5/urel/phonon.dll" - "!:\sys\bin\phonon.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/QtXmlPatterns.dll" - "!:\sys\bin\QtXmlPatterns.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/QtXmlPatterns.dll" - "!:\sys\bin\QtXmlPatterns.dll" "/epoc32/release/armv5/urel/qjpeg.dll" - "!:\sys\bin\qjpeg.dll" "/sf/mw/qt/src/s60installs/qmakepluginstubs/qjpeg.qtplugin" - "!:\resource\qt\plugins\imageformats\qjpeg.qtplugin" @@ -74,8 +69,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