summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-09 16:58:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-09 16:58:37 (GMT)
commitecf66e5825d186f57468c6bf682dce32c0cd96d7 (patch)
treee945d43208b1e166b27772662f5542384b99c567 /qmake
parente1b4ac7eec876d80dc2984f192baa6295b027793 (diff)
parentf38f61df31b708e1f4e50c5fdcc30099f9a1fe8f (diff)
downloadQt-ecf66e5825d186f57468c6bf682dce32c0cd96d7.zip
Qt-ecf66e5825d186f57468c6bf682dce32c0cd96d7.tar.gz
Qt-ecf66e5825d186f57468c6bf682dce32c0cd96d7.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed.. fix a few mistakes in German translation Fix Float Conversion in xmlpatterns generate code which does not break QT_USE_FAST_CONCATENATION with old gcc drastically improve load time of TS files
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions