diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 11:16:24 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-08 11:16:24 +0000 |
| commit | dab3fa107fa7b4a82928b71748b857ff85180f1e (patch) | |
| tree | 9a1e85401ae6b790209f666441f121bb13d1a7f8 /examples/quick/customitems | |
| parent | a889bcb6c3c66a616e73fa5ed3c9d900d7c7d6f5 (diff) | |
| parent | 68ba8fe3ccf7abe8d24ba3614f8d7ceb3778de74 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'examples/quick/customitems')
| -rw-r--r-- | examples/quick/customitems/maskedmousearea/images/cloud_1.png | bin | 49524 -> 49395 bytes |
| -rw-r--r-- | examples/quick/customitems/progressbar/content/background.png | bin | 426 -> 299 bytes |
| -rw-r--r-- | examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png | bin | 159568 -> 157358 bytes |
| -rw-r--r-- | examples/quick/customitems/searchbox/images/clear.png | bin | 429 -> 320 bytes |
| -rw-r--r-- | examples/quick/customitems/searchbox/images/lineedit-bg-focus.png | bin | 526 -> 297 bytes |
| -rw-r--r-- | examples/quick/customitems/searchbox/images/lineedit-bg.png | bin | 426 -> 299 bytes |
| -rw-r--r-- | examples/quick/customitems/spinner/content/spinner-bg.png | bin | 345 -> 274 bytes |
| -rw-r--r-- | examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png | bin | 5298 -> 4798 bytes |
| -rw-r--r-- | examples/quick/customitems/tabwidget/doc/images/tab.png | bin | 507 -> 309 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/examples/quick/customitems/maskedmousearea/images/cloud_1.png b/examples/quick/customitems/maskedmousearea/images/cloud_1.png Binary files differindex 87c54af253..9beb7e8442 100644 --- a/examples/quick/customitems/maskedmousearea/images/cloud_1.png +++ b/examples/quick/customitems/maskedmousearea/images/cloud_1.png diff --git a/examples/quick/customitems/progressbar/content/background.png b/examples/quick/customitems/progressbar/content/background.png Binary files differindex 9044226f85..5c316bc03e 100644 --- a/examples/quick/customitems/progressbar/content/background.png +++ b/examples/quick/customitems/progressbar/content/background.png diff --git a/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png b/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png Binary files differindex 54adf33daa..2c80421b06 100644 --- a/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png +++ b/examples/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png diff --git a/examples/quick/customitems/searchbox/images/clear.png b/examples/quick/customitems/searchbox/images/clear.png Binary files differindex 91eb270695..c20a9cfba5 100644 --- a/examples/quick/customitems/searchbox/images/clear.png +++ b/examples/quick/customitems/searchbox/images/clear.png diff --git a/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png b/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png Binary files differindex bbfac38d2d..c8f2722298 100644 --- a/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png +++ b/examples/quick/customitems/searchbox/images/lineedit-bg-focus.png diff --git a/examples/quick/customitems/searchbox/images/lineedit-bg.png b/examples/quick/customitems/searchbox/images/lineedit-bg.png Binary files differindex 9044226f85..5c316bc03e 100644 --- a/examples/quick/customitems/searchbox/images/lineedit-bg.png +++ b/examples/quick/customitems/searchbox/images/lineedit-bg.png diff --git a/examples/quick/customitems/spinner/content/spinner-bg.png b/examples/quick/customitems/spinner/content/spinner-bg.png Binary files differindex b3556f1f9f..da34fc4090 100644 --- a/examples/quick/customitems/spinner/content/spinner-bg.png +++ b/examples/quick/customitems/spinner/content/spinner-bg.png diff --git a/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png b/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png Binary files differindex 847052d301..2e1cae2584 100644 --- a/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png +++ b/examples/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png diff --git a/examples/quick/customitems/tabwidget/doc/images/tab.png b/examples/quick/customitems/tabwidget/doc/images/tab.png Binary files differindex ad8021605f..2ea989b68d 100644 --- a/examples/quick/customitems/tabwidget/doc/images/tab.png +++ b/examples/quick/customitems/tabwidget/doc/images/tab.png |
