summaryrefslogtreecommitdiffstats
path: root/tools/assistant
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-10 13:34:04 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-10 13:34:04 (GMT)
commitc765eb96672b6501f13491f6e9f7e7ed46ba9385 (patch)
tree1994fa767b66ace285562fd29470bac7dde5c89d /tools/assistant
parent5c36cc0ba648d5efa7592e86d49b23086cdbb8ff (diff)
parentd4bfaafbd7dc59f971c1abe67e8245163ca39132 (diff)
downloadQt-c765eb96672b6501f13491f6e9f7e7ed46ba9385.zip
Qt-c765eb96672b6501f13491f6e9f7e7ed46ba9385.tar.gz
Qt-c765eb96672b6501f13491f6e9f7e7ed46ba9385.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Configuring a static Qt build did not exclude WebKit if the -webkit option was given.
Diffstat (limited to 'tools/assistant')
0 files changed, 0 insertions, 0 deletions