diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-08-13 09:46:17 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-08-13 09:46:17 +0200 |
| commit | 1dade1bd8ad13a16152aff36351ac570b5b9fdf6 (patch) | |
| tree | eafed5710b34c327a98381ca15fe1985a6487b10 /qmake/doc/src/qmake-manual.qdoc | |
| parent | d45908e24292a41ff7838366b34be7340bf9fda5 (diff) | |
| parent | fb703aea697b12de4810deec9f8605fd062208bd (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
mkspecs/win32-clang-msvc/qmake.conf
src/corelib/tools/qlist.h
src/gui/painting/qcompositionfunctions.cpp
src/gui/painting/qtriangulator_p.h
src/gui/text/qfontengine_p.h
src/network/kernel/qhostinfo_p.h
src/platformsupport/fontdatabases/freetype/qfontengine_ft.cpp
Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io>
Change-Id: Ib8a0308cf77224c4fbdcf56778fdac4a43e37798
Diffstat (limited to 'qmake/doc/src/qmake-manual.qdoc')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index b271abcee3..3495f97b2c 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -2583,10 +2583,8 @@ \section1 RC_FILE - Specifies the name of the resource file for the application. - The value of this variable is typically handled by - qmake or \l{#QMAKESPEC}{qmake.conf} and rarely - needs to be modified. + Windows only. Specifies the name of the Windows resource file (.rc) for the + target. See \l{Adding Windows Resource Files}. \target RC_CODEPAGE \section1 RC_CODEPAGE @@ -2649,7 +2647,9 @@ \section1 RES_FILE - Specifies the name of the compiled Windows resource file for the target. + Windows only. Specifies the name of the Windows resource compiler's output + file for this target. See \l{RC_FILE} and \l{Adding Windows Resource Files}. + The value of this variable is typically handled by qmake or \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. |