Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: locusf/qtwayland-1
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: mer/5.4.0+git26+rpi
Choose a base ref
...
head repository: locusf/qtwayland-1
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: merqtfoo
Choose a head ref
  • 13 commits
  • 24 files changed
  • 6 contributors

Commits on Nov 10, 2015

  1. client: Remove the event thread

    If the compositor sends events to us while the main thread is blocked
    the socket notifier in the events thread would keep sending out the
    activated() signal, but no events would actually be read until the
    main thread starts to run again. That causes the event thread to keep
    queueing new events, and so allocating memory, potentially forever.
    This patch fixes the issue in maybe a bit radical way, that is by removing
    the event thread. The socket notifier now runs in the main thread so it
    will block if the events are not being read.
    Nowadays there is no real reason to keep the event thread around, as every
    thread that needs to receive wayland events can dispatch them on its own,
    we don't need a central dispatcher thread anymore.
    
    Change-Id: Ib7885e4b038b82719d78d193f465618a72cbe6af
    Reviewed-by: Pier Luigi Fiorini <[email protected]>
    giucam committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    eabca26 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2015

  1. Merge pull request mer-qt#49 from giucam/mer-5.4

    client: Remove the event thread
    giucam committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    f0efa60 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2016

  1. Configuration menu
    Copy the full SHA
    bae1692 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f3c726e View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2016

  1. Configuration menu
    Copy the full SHA
    24dfe98 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'mer-5.4' into 'mer-5.4'

    [spec] Improve spec files parametrization. Contributes to MER#1443
    
    
    
    See merge request !2
    faenil committed Jan 11, 2016
    Configuration menu
    Copy the full SHA
    0579c7f View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2016

  1. [wayland] Fix crash when pinging a surface with an invalid resource. …

    …Fixes JB#34185
    
    Check the surface hasn't been deleted before initiating the ping so
    that an invalid resource isn't dereferenced when printing a warning
    after the operation inevitably fails.
    
    Change-Id: I205def680971e50e59d761f16128cd4019234037
    denexter committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    a78ed55 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2016

  1. Merge branch 'jb34185' into 'mer-5.4'

    [wayland] Fix crash when pinging a surface with an invalid resource. Fixes JB#34185
    
    Check the surface hasn't been deleted before initiating the ping so
    that an invalid resource isn't dereferenced when printing a warning
    after the operation inevitably fails.
    
    Change-Id: I205def680971e50e59d761f16128cd4019234037
    
    See merge request !3
    rainemak committed Feb 25, 2016
    Configuration menu
    Copy the full SHA
    9dad99f View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2016

  1. [qtwayland] Fix copying to the clipboard failing. Fixes JB#32781

    A ulong timestamp with millisecond resolution overflows after about
    49 hours meaning a direct comparison between timestamps is only
    valid until that wrap point is reached.
    
    Given the timestamps originate in the compositor when the data source
    object is created it is difficult to see what information they provide
    which isn't implicit in the order of execution of calls to the function
    the check is in, making removing the check the safest course of action.
    
    Change-Id: I1b1d4458b913d54028e5e58d7eb3f217cc5b8186
    denexter committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    de92b08 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'jb32781' into 'mer-5.4'

    [qtwayland] Fix copying to the clipboard failing.  Fixes JB#32781
    
    A ulong timestamp with millisecond resolution overflows after a little
    under 9 hours meaning a direct comparison between timestamps is only
    valid in the first 9 hours the compositor has been running.
    
    Given the timestamps originate in the compositor when the data source
    object is created it is difficult to see what information they provide
    which isn't implicit in the order of execution of calls to the function
    the check is in, making removing the check the safest course of action.
    
    Change-Id: I1b1d4458b913d54028e5e58d7eb3f217cc5b8186
    
    See merge request !5
    adenexter committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    516a78b View commit details
    Browse the repository at this point in the history
  3. [wayland] Clear the retained clipboard data when a client clipboard i…

    …s cleared. Contributes to JB#33931
    
    Clear should mean clear.  When a client drops its data source drop the
    retained data and notify other clients in the same way as if the client
    simply set different data.
    
    Change-Id: Iaff5d0905d788fb990de6f78f06d1d0654285e19
    denexter committed Mar 15, 2016
    Configuration menu
    Copy the full SHA
    66be489 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2016

  1. Merge branch 'jb33931' into 'mer-5.4'

    [wayland] Clear the retained clipboard data when a client clipboard is cleared. Contributes to JB#33931
    
    Clear should mean clear.  When a client drops its data source drop the
    retained data and notify other clients in the same way as if the client
    simply set different data.
    
    Change-Id: Iaff5d0905d788fb990de6f78f06d1d0654285e19
    
    See merge request !4
    adenexter authored and denexter committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    d27cc89 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2016

  1. Configuration menu
    Copy the full SHA
    55752d6 View commit details
    Browse the repository at this point in the history
Loading