diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 23:42:37 +0200 |
commit | b9eca979f8557aa1d7f3cb1af01284720d23a425 (patch) | |
tree | 7bbc1cc7b17a6c65e43352dd55bfa77f5b2d5c39 /examples/quick/demos/rssnews | |
parent | 1148d3acead3c13072876b873fb4ee9440921943 (diff) | |
parent | dab3fa107fa7b4a82928b71748b857ff85180f1e (diff) |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I48c493b537e65276107ed7ee029312e294947e8b
Diffstat (limited to 'examples/quick/demos/rssnews')
-rw-r--r-- | examples/quick/demos/rssnews/content/images/btn_close.png | bin | 1267 -> 328 bytes |
-rw-r--r-- | examples/quick/demos/rssnews/content/images/busy.png | bin | 2629 -> 1564 bytes |
-rw-r--r-- | examples/quick/demos/rssnews/content/images/scrollbar.png | bin | 161 -> 79 bytes |
-rw-r--r-- | examples/quick/demos/rssnews/doc/images/qtquick-demo-rssnews-small.png | bin | 56864 -> 56830 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/examples/quick/demos/rssnews/content/images/btn_close.png b/examples/quick/demos/rssnews/content/images/btn_close.png Binary files differindex 6d635375eb..1a3dc44380 100644 --- a/examples/quick/demos/rssnews/content/images/btn_close.png +++ b/examples/quick/demos/rssnews/content/images/btn_close.png diff --git a/examples/quick/demos/rssnews/content/images/busy.png b/examples/quick/demos/rssnews/content/images/busy.png Binary files differindex 664c2b1491..fc65122d26 100644 --- a/examples/quick/demos/rssnews/content/images/busy.png +++ b/examples/quick/demos/rssnews/content/images/busy.png diff --git a/examples/quick/demos/rssnews/content/images/scrollbar.png b/examples/quick/demos/rssnews/content/images/scrollbar.png Binary files differindex 0228dcf9eb..c2425dd0df 100644 --- a/examples/quick/demos/rssnews/content/images/scrollbar.png +++ b/examples/quick/demos/rssnews/content/images/scrollbar.png diff --git a/examples/quick/demos/rssnews/doc/images/qtquick-demo-rssnews-small.png b/examples/quick/demos/rssnews/doc/images/qtquick-demo-rssnews-small.png Binary files differindex ffef99ee5c..9d324ceb70 100644 --- a/examples/quick/demos/rssnews/doc/images/qtquick-demo-rssnews-small.png +++ b/examples/quick/demos/rssnews/doc/images/qtquick-demo-rssnews-small.png |