diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-09-17 13:11:20 +0200 |
| commit | d74fd9b0d9bf5ab80e6c104fec5a92a9b3b9372d (patch) | |
| tree | 25056d484013efbbbb3eb1a78ad6a6449b671578 /examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png | |
| parent | 7de23e9fbb4c48152de5c1d26ed34cd68666aa30 (diff) | |
| parent | 89afebb830f616a6e8c43dd37bf34551f243b264 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/3rdparty
src/core/core_common.pri
Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
Diffstat (limited to 'examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png')
| -rw-r--r-- | examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png | bin | 0 -> 1927 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png Binary files differnew file mode 100644 index 000000000..e7a8d1722 --- /dev/null +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png |