summaryrefslogtreecommitdiffstats
path: root/tests/auto/qhelpgenerator
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-02 14:59:12 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-02 14:59:12 (GMT)
commit0a357d05f43a8133d8e5d3daa8204a0c55f39ff9 (patch)
tree8d077b39253bb60beed5e0dcbacbf1164a211371 /tests/auto/qhelpgenerator
parent8bd714033eeb86fc20da4305a9491c2fb82f4476 (diff)
parentc1b067ea8169e1d37e2a120334406f1f115298bb (diff)
downloadQt-0a357d05f43a8133d8e5d3daa8204a0c55f39ff9.zip
Qt-0a357d05f43a8133d8e5d3daa8204a0c55f39ff9.tar.gz
Qt-0a357d05f43a8133d8e5d3daa8204a0c55f39ff9.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 strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
Diffstat (limited to 'tests/auto/qhelpgenerator')
0 files changed, 0 insertions, 0 deletions