diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-29 07:52:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-29 07:52:22 (GMT) |
| commit | 2e5b5801a86c712f6873cfb423e1a95892b87047 (patch) | |
| tree | c91d33f86c3d2a20f40d0a71bf7def1e16ac623a /doc | |
| parent | 2f91e9ce0e02f613d68b5b59d00b61c8f4f12c68 (diff) | |
| parent | c2e53adcb015e142436127f989b0f219df7ade36 (diff) | |
| download | Qt-2e5b5801a86c712f6873cfb423e1a95892b87047.zip Qt-2e5b5801a86c712f6873cfb423e1a95892b87047.tar.gz Qt-2e5b5801a86c712f6873cfb423e1a95892b87047.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix header labels on mac with rtl
examples/dbus: update remotecontrolledcar example
examples/dbus: update dbus-chat adaptor/interface files
doc: Fix typo in QEvent::ignore() documentation
doc: Fix qmake-manual warn_on/warn_off references
Diffstat (limited to 'doc')
| -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. |