summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-29 21:19:18 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-29 21:19:18 (GMT)
commit78c5825cfb7702350636b7624bf79311dbd0dbd5 (patch)
treefeaccae2699cefb5758a08a0c9387dc7f22db683 /src/declarative
parentffce38caefab278e7088f5156c1be2ae4f402af6 (diff)
parent53c7142463d065cace71bd42909fe4941bc59fc7 (diff)
downloadQt-78c5825cfb7702350636b7624bf79311dbd0dbd5.zip
Qt-78c5825cfb7702350636b7624bf79311dbd0dbd5.tar.gz
Qt-78c5825cfb7702350636b7624bf79311dbd0dbd5.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Do not unconditionally use pkg-config in .pro files Updated WebKit to dda59e50379214c098f365a39c4d64b39ced427e Updated WebKit to 85d4df147ac7b239497b05979a51fd6fde7580fd Updated WebKit to 836fa24be73978fb292e954abb151fb46b1d97e0 Updated WebKit to 4277f8277b1daf3ec33c996f5a760ccd1113af4b Updated WebKit to 8ed79cb10ca72b5d240beae674a7932963cbd007 Updated WebKit to 66b76cdb8ef823f27a8229c5cae2d35e7f2d3c59
Diffstat (limited to 'src/declarative')
0 files changed, 0 insertions, 0 deletions