summaryrefslogtreecommitdiffstats
path: root/tools/qtconfig
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-03 05:21:49 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-03 05:21:49 (GMT)
commitce01f19674923cb5144bb56fe76ecbe19865d3bd (patch)
tree2235ab6b1b469ca0232ccf621309e3a90d770e2a /tools/qtconfig
parentdaeb81493aef4fd8f632ba4ea7f8d12ed80fa7be (diff)
parent1358c4b53cf4cec83ea6d9b0f886b99f76c4847e (diff)
downloadQt-ce01f19674923cb5144bb56fe76ecbe19865d3bd.zip
Qt-ce01f19674923cb5144bb56fe76ecbe19865d3bd.tar.gz
Qt-ce01f19674923cb5144bb56fe76ecbe19865d3bd.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Consolidate zlib configuration redundancy Fixed whitespace formatting Fix incomplete support for built-in jpeg, mng, tiff and gif handlers Split image handler plugin project files No explicit link to zlib/jpeg for system mng/tiff Removed stray line continuations Long live else! qdoc: Added a solution for creating tables of contents for manuals. Doc: Fixed markup. Fixed size hint for combo box on windows
Diffstat (limited to 'tools/qtconfig')
0 files changed, 0 insertions, 0 deletions