Merge branch 'newdocs'
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Tue, 20 Nov 2012 09:08:29 +0000 (10:08 +0100)
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Tue, 20 Nov 2012 09:12:44 +0000 (10:12 +0100)
commit0dc61c4216697a2c4066d4735b4be941e869e514
tree8a3876897fc5144cc2f9b28223ff9548944a8775
parentb98b11fa036ea301d1483df6f533ec55be727d9d
parenta769a212e0c22283fc05d3f49c252f8e2a62ba3f
Merge branch 'newdocs'

Added prepare_docs to qt_build_config.prf (it was added
directly in configure in the source branch)

Conflicts:
configure
tools/configure/configureapp.cpp

Change-Id: I1337c69fc62b1c934e3e39b4409e4857440c9db8
configure
mkspecs/features/qt_build_config.prf
src/testlib/qtestcase.cpp