summaryrefslogtreecommitdiffstats
path: root/qmake/qmake.pri
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-27 03:17:35 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-27 03:17:35 (GMT)
commit8483ebbfd0753cd9c02b0682fdbeb636e273de87 (patch)
tree2595524dd44ad1e5a722e1bcee339eb1622ab3c6 /qmake/qmake.pri
parentdaf16a0f6e495aed4e8b68bd4b3fb2eff1c90969 (diff)
parentc4c6d2ac94e84c38b8ec6fc0710ff91fc04451fe (diff)
downloadQt-8483ebbfd0753cd9c02b0682fdbeb636e273de87.zip
Qt-8483ebbfd0753cd9c02b0682fdbeb636e273de87.tar.gz
Qt-8483ebbfd0753cd9c02b0682fdbeb636e273de87.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Adjusted layout of audiodevice example to use scrollbar.
Diffstat (limited to 'qmake/qmake.pri')
0 files changed, 0 insertions, 0 deletions