diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-01 02:17:47 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-01 02:17:47 (GMT) |
| commit | 3733ee3ca9fdc964f2453089ca18c9179839846e (patch) | |
| tree | 95cb7a51eb51f612611f48b44a51c23bcd0f8727 /doc/src | |
| parent | a16a6e6fb3cf9d9c70515d2361bc06c598c27f3f (diff) | |
| parent | 8a2f4988afa8af09e4e8ed39d76c8eac0ba30390 (diff) | |
| download | Qt-3733ee3ca9fdc964f2453089ca18c9179839846e.zip Qt-3733ee3ca9fdc964f2453089ca18c9179839846e.tar.gz Qt-3733ee3ca9fdc964f2453089ca18c9179839846e.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'doc/src')
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index d7aa0db..3d5c792 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -1977,7 +1977,7 @@ distinction between shared and \section1 QMAKE_CFLAGS_WARN_OFF This variable is not empty if the warn_off - \l{#TEMPLATE}{TEMPLATE} option is specified. The value of this + \l{#CONFIG}{CONFIG} option is specified. The value of this variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. @@ -1985,7 +1985,7 @@ distinction between shared and \section1 QMAKE_CFLAGS_WARN_ON This variable is not empty if the warn_on - \l{#TEMPLATE}{TEMPLATE} option is specified. + \l{#CONFIG}{CONFIG} option is specified. The value of this variable is typically handled by \c qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. |