diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 19:17:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-15 19:17:09 (GMT) |
| commit | d01b4d9f9ace7e815bd5881dcb6ab79bf2fdaba4 (patch) | |
| tree | 64812f67bc791221a51a3282a457f0437d81e89a /src/s60installs | |
| parent | d3418466c75169a9a1d114c3d0f775288dbc40e7 (diff) | |
| parent | 28ce5c1f2c0dbbfe45b5c3744bf03a2548c12223 (diff) | |
| download | Qt-d01b4d9f9ace7e815bd5881dcb6ab79bf2fdaba4.zip Qt-d01b4d9f9ace7e815bd5881dcb6ab79bf2fdaba4.tar.gz Qt-d01b4d9f9ace7e815bd5881dcb6ab79bf2fdaba4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
ComboBox popuplist is not correctly layouted in fullscreen mode
Stylus menu for Share (QT app) is different from native S60 apps
Change $${EPOCROOT} to also have drive if EPOCROOT env variable has it
Stylus menu for Share (QT app) is different from native S60 apps
Diffstat (limited to 'src/s60installs')
| -rw-r--r-- | src/s60installs/s60installs.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/s60installs/s60installs.pro b/src/s60installs/s60installs.pro index d751134..ce0f4f1 100644 --- a/src/s60installs/s60installs.pro +++ b/src/s60installs/s60installs.pro @@ -16,8 +16,8 @@ symbian: { # It is also expected that devices newer than those based on S60 5.0 all have sqlite3.dll. contains(S60_VERSION, 3.1)|contains(S60_VERSION, 3.2)|contains(S60_VERSION, 5.0) { BLD_INF_RULES.prj_exports += \ - "sqlite3.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3.sis" \ - "sqlite3_selfsigned.sis $${EPOCROOT}epoc32/data/qt/sis/sqlite3_selfsigned.sis" + "sqlite3.sis /epoc32/data/qt/sis/sqlite3.sis" \ + "sqlite3_selfsigned.sis /epoc32/data/qt/sis/sqlite3_selfsigned.sis" symbian-abld|symbian-sbsv2 { sqlitedeployment = \ "; Deploy sqlite onto phone that does not have it already" \ |