summaryrefslogtreecommitdiffstats
path: root/qmake/doc
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-09-07 16:17:29 +0200
committerSergio Ahumada <sergio.ahumada@digia.com>2013-09-07 16:18:32 +0200
commit2346ae167568bb9e5d247da0b946067b7f9aad48 (patch)
treef3a975711bcd223f4d6803caa5b53c080bb68819 /qmake/doc
parent5dd2713c8ba98e06ae5c4f3da44b2ed73121d247 (diff)
parent730bc064a070e886e10950ccfd59780e8976f5fd (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'qmake/doc')
-rw-r--r--qmake/doc/src/qmake-manual.qdoc6
1 files changed, 4 insertions, 2 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
index 03eb3115f6..74f8db0012 100644
--- a/qmake/doc/src/qmake-manual.qdoc
+++ b/qmake/doc/src/qmake-manual.qdoc
@@ -4006,8 +4006,10 @@
include the precompiled header file in \c HEADERS, as
qmake will do this if the configuration supports precompiled headers.
- All platforms that support precompiled headers have the configuration
- option \c precompile_header set. Using this option, you may trigger
+ The MSVC and g++ specs targeting Windows (and Windows CE) enable
+ \c precompile_header by default.
+
+ Using this option, you may trigger
conditional blocks in your project file to add settings when using
precompiled headers.
For example: