summaryrefslogtreecommitdiffstats
path: root/src/plugins/s60/3_2
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6-s60' into 4.7-s60axis2010-03-221-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| * Useful support for -qtlibinfix configure parameter in SymbianMiikka Heikkinen2010-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure parameter -qtlibinfix will now change also plugin names of plugins built and installed with Qt in Symbian. Default plugin path is changed to: /resource/qt<libinfix>/plugins. Other plugins besides the ones installed with Qt are not renamed. With infixed configuration, Qt can be installed on a phone that already has a Qt installed on ROM without interfering with the ROM version of Qt. Note that since s60main.rsc resource cannot deployed with infixed Qt, and infixing it is somewhat problematic, currently the phone needs to have proper Qt installation, too, for infixed Qt to work. It also means that any changes to Qt that would affect s60main.rsc cannot be tested on real device using infixed builds. Since this file is unlikely to need changing, this should not be a big problem. Task-number: QTBUG-9065 Reviewed-by: Jani Hautakangas
* | Worked around case differences in Symbian^3 and Gnupoc.axis2010-03-161-1/+6
|/ | | | RevBy: Miikka Heikkinen
* Fixed filename cases to support building Qt for Symbian in LinuxMiikka Heikkinen2010-03-121-1/+1
| | | | | | | Part of QtP delta reduction effort. Task-number: QT-3055 Reviewed-by: Janne Koskinen
* Fix 3.1 build - move unimplemented RFs API to the S60 pluginShane Kearns2009-09-231-3/+5
| | | | | | | | | RFs::GetSystemDrive doesn't exist in 3.1 (even though it is in the symbian documentation). Moved it to a new function in the S60 plugins. For 3.1, it returns EDriveC, for all other versions the RFs API is used Task-number: QT-805 Reviewed-by: Iain
* Long live Qt for S60!axis2009-04-241-0/+15