summaryrefslogtreecommitdiffstats
path: root/src/testlib/3rdparty
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-05-20 10:14:55 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-05-20 10:14:55 (GMT)
commit15f1eb3ad010dbfd0941ae32d657d4ddcc07b24e (patch)
tree7992eca6c8fc0844596f4b77d175cef0f4d6d233 /src/testlib/3rdparty
parent1876205f3054bec91f1ada89c8d8b1eef61193ab (diff)
parent894cbac989cada9d54bc65e4d8cb22682ff50ad9 (diff)
downloadQt-15f1eb3ad010dbfd0941ae32d657d4ddcc07b24e.zip
Qt-15f1eb3ad010dbfd0941ae32d657d4ddcc07b24e.tar.gz
Qt-15f1eb3ad010dbfd0941ae32d657d4ddcc07b24e.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 WebKit version dependency in pkg files Add support for including module specific .pri files as part of qt.prf handling My changelog entries for 4.6.3 Add my changes to the 4.6.3 changes log my changelog for 4.6.3
Diffstat (limited to 'src/testlib/3rdparty')
0 files changed, 0 insertions, 0 deletions