summaryrefslogtreecommitdiffstats
path: root/src/s60main/qts60main.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2009-12-19 15:19:59 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2009-12-19 15:19:59 (GMT)
commit69e848ff4a8dad648f706a34b106b8a84155c875 (patch)
tree34ece1e7c902bce1f50e0559636c5729e138b13f /src/s60main/qts60main.cpp
parent7956bfe376baddccaf1fd150ffc62cdd158c8030 (diff)
parent2555b0f9b106f166589a806b822c184ba1ddc0c6 (diff)
downloadQt-69e848ff4a8dad648f706a34b106b8a84155c875.zip
Qt-69e848ff4a8dad648f706a34b106b8a84155c875.tar.gz
Qt-69e848ff4a8dad648f706a34b106b8a84155c875.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a bug in resizing the anomaly browser demo. doc: Added a missing \sa command, plus a \l in the text. Improve the performance of the Anomaly browser demo Fixed crash when parsing invalid polygons in svgs. doc: Fixed typos. Fixed QResource to respect the explicitely set locale Change QHostInfo to use 5 parallel lookup threads Doc: fix typo fix Cocoa build
Diffstat (limited to 'src/s60main/qts60main.cpp')
0 files changed, 0 insertions, 0 deletions