diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-01-28 15:40:10 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-01-28 15:40:10 (GMT) |
| commit | cca6d17a40e3435b3e41c09a5eba20f50b28e9ae (patch) | |
| tree | f1135171e2c56f03f65405e54ceb47fb5d756d2c /doc | |
| parent | c58ac55bbe65866db85ba1338642c00fe5cc2a70 (diff) | |
| parent | 9fc350e8358f55c13169a9383bd2bd85592bb231 (diff) | |
| download | Qt-cca6d17a40e3435b3e41c09a5eba20f50b28e9ae.zip Qt-cca6d17a40e3435b3e41c09a5eba20f50b28e9ae.tar.gz Qt-cca6d17a40e3435b3e41c09a5eba20f50b28e9ae.tar.bz2 | |
Merge commit 'refs/merge-requests/388' of git://gitorious.org/qt/qt into integration
Conflicts:
examples/dbus/dbus-chat/chat_adaptor.cpp
examples/dbus/dbus-chat/chat_adaptor.h
examples/dbus/dbus-chat/chat_interface.cpp
examples/dbus/dbus-chat/chat_interface.h
examples/dbus/remotecontrolledcar/car/car_adaptor.cpp
examples/dbus/remotecontrolledcar/car/car_adaptor_p.h
examples/dbus/remotecontrolledcar/controller/car_interface.cpp
examples/dbus/remotecontrolledcar/controller/car_interface_p.h
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. |