summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qsound_s60.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-18 09:09:13 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-18 09:09:13 (GMT)
commit7cfae48c7ff8b0f8fa6e0a530ff86b30c1665508 (patch)
tree07631bea961291317cfe835a0204bd1a76e0532b /src/gui/kernel/qsound_s60.cpp
parent01cf14ef278f564936eff9a392679526fe14e530 (diff)
parent342b916ab4fb1a9c6f3a2608e7c5a43d6a763981 (diff)
downloadQt-7cfae48c7ff8b0f8fa6e0a530ff86b30c1665508.zip
Qt-7cfae48c7ff8b0f8fa6e0a530ff86b30c1665508.tar.gz
Qt-7cfae48c7ff8b0f8fa6e0a530ff86b30c1665508.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use correct include path for qglobal.h Fixed softkey localizaton to comile also on platforms without softkeys. Use correct (forward slash) separators in qmake-generated bld.inf Support for dynamic localization in Symbian softkeys.
Diffstat (limited to 'src/gui/kernel/qsound_s60.cpp')
0 files changed, 0 insertions, 0 deletions