The following changes since commit 681d61362d3f766a00806b89d6581869041f73cb:

  Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging (2019-01-17 12:48:42 +0000)

are available in the git repository at:

  git://git.kraxel.org/qemu tags/ui-20190121-pull-request

for you to fetch changes up to fbd57c754f32804a63295f70f271d1ef128ee590:

  egl-helpers.h: do not depend on X11 Window type, use EGLNativeWindowType (2019-01-21 09:44:32 +0100)

----------------------------------------------------------------
ui: highres logo for sdl and gtk, bugfixes for vnc and egl.

----------------------------------------------------------------

Alexander Kanavin (1):
  egl-helpers.h: do not depend on X11 Window type, use
    EGLNativeWindowType

Daniel P. Berrangé (3):
  ui: install logo icons to $prefix/share/icons
  ui: fix icon display for GTK frontend under GNOME Shell with Wayland
  sdl: add support for high resolution window icon

Gerd Hoffmann (1):
  vnc: detect and optimize pageflips

 configure                                          |  47 +++++++++++++++++++++
 Makefile                                           |  16 ++++++-
 include/ui/egl-helpers.h                           |   2 +-
 include/ui/sdl2.h                                  |   3 ++
 ui/egl-helpers.c                                   |   4 +-
 ui/gtk-egl.c                                       |   3 +-
 ui/gtk.c                                           |  18 +++-----
 ui/sdl2.c                                          |  22 +++++-----
 ui/vnc.c                                           |  25 +++++++++--
 pc-bios/qemu-icon.bmp                              | Bin 630 -> 0 bytes
 ui/icons/Makefile                                  |  13 ++++++
 pc-bios/qemu_logo_no_text.svg => ui/icons/qemu.svg |   0
 ui/icons/qemu_128x128.png                          | Bin 0 -> 8286 bytes
 ui/icons/qemu_16x16.png                            | Bin 0 -> 765 bytes
 ui/icons/qemu_24x24.png                            | Bin 0 -> 1201 bytes
 ui/icons/qemu_256x256.png                          | Bin 0 -> 17572 bytes
 ui/icons/qemu_32x32.bmp                            | Bin 0 -> 4234 bytes
 ui/icons/qemu_32x32.png                            | Bin 0 -> 1696 bytes
 ui/icons/qemu_48x48.png                            | Bin 0 -> 2694 bytes
 ui/icons/qemu_512x512.png                          | Bin 0 -> 38007 bytes
 ui/icons/qemu_64x64.png                            | Bin 0 -> 3807 bytes
 ui/qemu.desktop                                    |   8 ++++
 22 files changed, 131 insertions(+), 30 deletions(-)
 delete mode 100644 pc-bios/qemu-icon.bmp
 create mode 100644 ui/icons/Makefile
 rename pc-bios/qemu_logo_no_text.svg => ui/icons/qemu.svg (100%)
 create mode 100644 ui/icons/qemu_128x128.png
 create mode 100644 ui/icons/qemu_16x16.png
 create mode 100644 ui/icons/qemu_24x24.png
 create mode 100644 ui/icons/qemu_256x256.png
 create mode 100644 ui/icons/qemu_32x32.bmp
 create mode 100644 ui/icons/qemu_32x32.png
 create mode 100644 ui/icons/qemu_48x48.png
 create mode 100644 ui/icons/qemu_512x512.png
 create mode 100644 ui/icons/qemu_64x64.png
 create mode 100644 ui/qemu.desktop

-- 
2.9.3

On Mon, 21 Jan 2019 at 14:15, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 681d61362d3f766a00806b89d6581869041f73cb:
>
>   Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging (2019-01-17 12:48:42 +0000)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/ui-20190121-pull-request
>
> for you to fetch changes up to fbd57c754f32804a63295f70f271d1ef128ee590:
>
>   egl-helpers.h: do not depend on X11 Window type, use EGLNativeWindowType (2019-01-21 09:44:32 +0100)
>
> ----------------------------------------------------------------
> ui: highres logo for sdl and gtk, bugfixes for vnc and egl.
>
> ----------------------------------------------------------------

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/4.0
for any user-visible changes.

-- PMM

On Mon, 21 Jan 2019 at 14:15, Gerd Hoffmann <kraxel@redhat.com> wrote:
>
> The following changes since commit 681d61362d3f766a00806b89d6581869041f73cb:
>
>   Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' into staging (2019-01-17 12:48:42 +0000)
>
> are available in the git repository at:
>
>   git://git.kraxel.org/qemu tags/ui-20190121-pull-request
>
> for you to fetch changes up to fbd57c754f32804a63295f70f271d1ef128ee590:
>
>   egl-helpers.h: do not depend on X11 Window type, use EGLNativeWindowType (2019-01-21 09:44:32 +0100)
>
> ----------------------------------------------------------------
> ui: highres logo for sdl and gtk, bugfixes for vnc and egl.
>
> ----------------------------------------------------------------
>
> Alexander Kanavin (1):
>   egl-helpers.h: do not depend on X11 Window type, use
>     EGLNativeWindowType
>
> Daniel P. Berrangé (3):
>   ui: install logo icons to $prefix/share/icons
>   ui: fix icon display for GTK frontend under GNOME Shell with Wayland
>   sdl: add support for high resolution window icon
>
> Gerd Hoffmann (1):
>   vnc: detect and optimize pageflips

>  delete mode 100644 pc-bios/qemu-icon.bmp

Doesn't this break the SDL UI? ui/sdl.c still looks for
qemu-icon.bmp...

thanks
-- PMM

> >  delete mode 100644 pc-bios/qemu-icon.bmp
> 
> Doesn't this break the SDL UI? ui/sdl.c still looks for
> qemu-icon.bmp...

Well, a little bit, and SDL 1.2 only.  The icon is gone.  qemu runs fine
though.

SDL 1.2 is deprecated though, and I'm busy looking at the remaining
blockers for SDL 1.2 removal.  I expect it being removed before 4.0.

cheers,
  Gerd