Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocs
authorJerome Pasion <jerome.pasion@digia.com>
Fri, 2 Nov 2012 13:41:27 +0000 (14:41 +0100)
committerJerome Pasion <jerome.pasion@digia.com>
Fri, 2 Nov 2012 13:41:27 +0000 (14:41 +0100)
commitc808dd27459e030fde0577feb8ba06e3bd465526
tree4bf898dc4a88e2b03c9716f940638a2e01c6c0ce
parentd9d8845d507a6bdbc9c9f24c0d9d86dca513461d
parent300534fc214f2547a63594ce0891e9a54c8f33ca
Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocs

Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17
configure
src/testlib/qtestcase.cpp
tools/configure/configureapp.cpp