diff options
author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-11-20 10:08:29 +0100 |
---|---|---|
committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2012-11-20 10:12:44 +0100 |
commit | 0dc61c4216697a2c4066d4735b4be941e869e514 (patch) | |
tree | 8a3876897fc5144cc2f9b28223ff9548944a8775 /mkspecs/features/qt_build_config.prf | |
parent | b98b11fa036ea301d1483df6f533ec55be727d9d (diff) | |
parent | a769a212e0c22283fc05d3f49c252f8e2a62ba3f (diff) |
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
Diffstat (limited to 'mkspecs/features/qt_build_config.prf')
-rw-r--r-- | mkspecs/features/qt_build_config.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index 786275dd8a..b386e39235 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -25,7 +25,7 @@ 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. |