diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2020-05-11 21:49:28 +0800 |
|---|---|---|
| committer | Yuhang Zhao <2546789017@qq.com> | 2020-05-11 23:36:27 +0000 |
| commit | 2844631aa977fb1619ec3910090d1bdd4c7459c2 (patch) | |
| tree | 6bcb1e78d8a650e9fab47601a6ebdb286ed3916e /qmake | |
| parent | 745fae0dc1fb762a2f2a961d52953ec43fa7773b (diff) | |
qmake: Remove the DISCARDABLE flag for icon resources
According to [1] the DISCARDABLE attribute is for 16-bit Windows,
and it is ignored. We can drop it.
[1] https://docs.microsoft.com/en-us/windows/win32/menurc/common-resource-attributes
Change-Id: I70e5b0441a9d20f6c76c3d7a84947f8bce5c8fbd
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/win32/winmakefile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/win32/winmakefile.cpp b/qmake/generators/win32/winmakefile.cpp index b892b69922..a5d96483a8 100644 --- a/qmake/generators/win32/winmakefile.cpp +++ b/qmake/generators/win32/winmakefile.cpp @@ -366,7 +366,7 @@ void Win32MakefileGenerator::processRcFileVar() ts << Qt::endl; if (!rcIcons.isEmpty()) { for (int i = 0; i < rcIcons.size(); ++i) - ts << QString("IDI_ICON%1\tICON\tDISCARDABLE\t%2").arg(i + 1).arg(cQuoted(rcIcons[i])) << Qt::endl; + ts << QString("IDI_ICON%1\tICON\t%2").arg(i + 1).arg(cQuoted(rcIcons[i])) << Qt::endl; ts << Qt::endl; } if (!manifestFile.isEmpty()) { |