Merge branch 'fix-Qt-manual-typo' into release

This commit is contained in:
Brad King 2014-03-26 13:24:10 -04:00
commit 8272bbc0e4
1 changed files with 1 additions and 1 deletions

View File

@ -173,7 +173,7 @@ The Qt 4 and 5 :prop_tgt:`IMPORTED` targets for the QtGui libraries specify
that the qtmain.lib static library shipped with Qt will be linked by all that the qtmain.lib static library shipped with Qt will be linked by all
dependent executables which have the :prop_tgt:`WIN32_EXECUTABLE` enabled. dependent executables which have the :prop_tgt:`WIN32_EXECUTABLE` enabled.
Do disable this behavior, enable the ``Qt5_NO_LINK_QTMAIN`` target property for To disable this behavior, enable the ``Qt5_NO_LINK_QTMAIN`` target property for
Qt 5 based targets or ``QT4_NO_LINK_QTMAIN`` target property for Qt 4 based Qt 5 based targets or ``QT4_NO_LINK_QTMAIN`` target property for Qt 4 based
targets. targets.