diff options
| author | Fredrik Orderud <fredrik.orderud@ge.com> | 2019-02-25 10:49:25 +0100 |
|---|---|---|
| committer | Fredrik Orderud <forderud@gmail.com> | 2019-02-26 09:11:27 +0000 |
| commit | 3832b74aca592f8edf4cc54867d0a56334e797e7 (patch) | |
| tree | dc15f86134d1085a434b4326a7bf7c02f078ba63 /examples | |
| parent | 9f33e7a96b3d68568d12a072e3c5bb0111219ed1 (diff) | |
Stop using DISCARDABLE attribute for icon resources
The DISCARDABLE attribute is only supported on 16bit Windows, and is ignored for 32 &
64bit applications. Usage can therefore be removed to simplify the sample code.
Microsoft doc: https://docs.microsoft.com/en-us/windows/desktop/menurc/common-resource-attributes
Change-Id: Ib84217a79cb726b6c1355107e6b254033de515fe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/activeqt/hierarchy/hierarchy.rc | 2 | ||||
| -rw-r--r-- | examples/activeqt/menus/menus.rc | 2 | ||||
| -rw-r--r-- | examples/activeqt/multiple/multipleax.rc | 2 | ||||
| -rw-r--r-- | examples/activeqt/opengl/opengl.rc | 2 | ||||
| -rw-r--r-- | examples/activeqt/simple/simple.rc | 2 | ||||
| -rw-r--r-- | examples/activeqt/simpleqml/simpleqml.rc | 2 | ||||
| -rw-r--r-- | examples/activeqt/wrapper/wrapperax.rc | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/examples/activeqt/hierarchy/hierarchy.rc b/examples/activeqt/hierarchy/hierarchy.rc index da962f9..70eb503 100644 --- a/examples/activeqt/hierarchy/hierarchy.rc +++ b/examples/activeqt/hierarchy/hierarchy.rc @@ -1,2 +1,2 @@ 1 TYPELIB "hierarchy.rc" -1 ICON DISCARDABLE "hierarchy.ico" +1 ICON "hierarchy.ico" diff --git a/examples/activeqt/menus/menus.rc b/examples/activeqt/menus/menus.rc index fed692c..d466b35 100644 --- a/examples/activeqt/menus/menus.rc +++ b/examples/activeqt/menus/menus.rc @@ -1,2 +1,2 @@ 1 TYPELIB "menus.rc" -1 ICON DISCARDABLE "menus.ico" +1 ICON "menus.ico" diff --git a/examples/activeqt/multiple/multipleax.rc b/examples/activeqt/multiple/multipleax.rc index a847979..a9bcc1a 100644 --- a/examples/activeqt/multiple/multipleax.rc +++ b/examples/activeqt/multiple/multipleax.rc @@ -1,7 +1,7 @@ #include "winver.h" 1 TYPELIB "multipleax.rc" -1 ICON DISCARDABLE "multipleax.ico" +1 ICON "multipleax.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,0 diff --git a/examples/activeqt/opengl/opengl.rc b/examples/activeqt/opengl/opengl.rc index f8282d8..02c0898 100644 --- a/examples/activeqt/opengl/opengl.rc +++ b/examples/activeqt/opengl/opengl.rc @@ -1,2 +1,2 @@ 1 TYPELIB "opengl.rc" -1 ICON DISCARDABLE "opengl.ico" +1 ICON "opengl.ico" diff --git a/examples/activeqt/simple/simple.rc b/examples/activeqt/simple/simple.rc index 3b40377..e38d406 100644 --- a/examples/activeqt/simple/simple.rc +++ b/examples/activeqt/simple/simple.rc @@ -1,3 +1,3 @@ 1 TYPELIB "simple.rc" -1 ICON DISCARDABLE "simple.ico" +1 ICON "simple.ico" diff --git a/examples/activeqt/simpleqml/simpleqml.rc b/examples/activeqt/simpleqml/simpleqml.rc index 7a6d549..d2978ce 100644 --- a/examples/activeqt/simpleqml/simpleqml.rc +++ b/examples/activeqt/simpleqml/simpleqml.rc @@ -1,2 +1,2 @@ 1 TYPELIB "simpleqml.rc" -1 ICON DISCARDABLE "simpleqml.ico" +1 ICON "simpleqml.ico" diff --git a/examples/activeqt/wrapper/wrapperax.rc b/examples/activeqt/wrapper/wrapperax.rc index 6db5316..c03c49e 100644 --- a/examples/activeqt/wrapper/wrapperax.rc +++ b/examples/activeqt/wrapper/wrapperax.rc @@ -1,7 +1,7 @@ #include "winver.h" 1 TYPELIB "wrapperax.rc" -1 ICON DISCARDABLE "wrapperax.ico" +1 ICON "wrapperax.ico" VS_VERSION_INFO VERSIONINFO FILEVERSION 1,0,0,0 |