diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:52:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-07-06 13:54:25 +0200 |
| commit | 7f269a5db8b88fbb14ee741f78e726b1a46c7d4d (patch) | |
| tree | fa63387e6f70187e656dd9e6c4f1cd1b1f96c263 /src/widgets/doc/images/macintosh-horizontalscrollbar.png | |
| parent | 9ca3443a37284bedaf74475c26af173b00757178 (diff) | |
| parent | 03b4838cb51513bd5d2edf76dccc4bc4a1181681 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I43531e087bb810889d5c1fbfcdffb29b78804839
Diffstat (limited to 'src/widgets/doc/images/macintosh-horizontalscrollbar.png')
| -rw-r--r-- | src/widgets/doc/images/macintosh-horizontalscrollbar.png | bin | 2242 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/src/widgets/doc/images/macintosh-horizontalscrollbar.png b/src/widgets/doc/images/macintosh-horizontalscrollbar.png Binary files differdeleted file mode 100644 index 8b63572a9e..0000000000 --- a/src/widgets/doc/images/macintosh-horizontalscrollbar.png +++ /dev/null |
