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

diff --cc configure
Simple merge

diff --cc mkspecs/features/qt_build_config.prf
index 786275d,01605da..b386e39
--- 1/mkspecs/features/qt_build_config.prf
--- 2/mkspecs/features/qt_build_config.prf
+++ b/mkspecs/features/qt_build_config.prf
@@@ -25,8 -25,6 +25,8 @@@ mac 
     }
  }
  
- CONFIG += create_prl link_prl no_private_qt_headers_warning QTDIR_build
++CONFIG += create_prl link_prl prepare_docs no_private_qt_headers_warning QTDIR_build
 +
  # Qt modules get compiled without exceptions enabled by default.
  # However, testcases should be still built with exceptions.
  CONFIG += exceptions_off testcase_exceptions

diff --cc src/testlib/qtestcase.cpp
Simple merge