diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-07 10:56:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 13:03:25 +0200 |
| commit | 68ba8fe3ccf7abe8d24ba3614f8d7ceb3778de74 (patch) | |
| tree | 8fdc2922aa5375203fef05746691e88632a92bbe /examples/quick/demos | |
| parent | 0d8de448ef746aea7215f6f654660500dc9601d2 (diff) | |
| parent | a676e4e2dae945c02521691c7018f5a5534feff9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
This change also fixes the build of two benchmarks, tst_affectors
and tst_emission.
Conflicts:
src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro
src/qml/qml/ftw/qhashfield_p.h
tests/benchmarks/particles/affectors/tst_affectors.cpp
tests/benchmarks/particles/emission/tst_emission.cpp
tests/benchmarks/qml/pointers/pointers.pro
tests/benchmarks/qml/pointers/tst_pointers.cpp
tests/benchmarks/qml/qmltime/qmltime.pro
tests/benchmarks/qml/qquickwindow/qquickwindow.pro
Change-Id: I595309d1e183c18371cb9b07af6e4681059de3b2
Diffstat (limited to 'examples/quick/demos')
12 files changed, 0 insertions, 0 deletions
diff --git a/examples/quick/demos/clocks/content/hour.png b/examples/quick/demos/clocks/content/hour.png Binary files differindex f8061a1235..9f33fc5d48 100644 --- a/examples/quick/demos/clocks/content/hour.png +++ b/examples/quick/demos/clocks/content/hour.png diff --git a/examples/quick/demos/clocks/content/minute.png b/examples/quick/demos/clocks/content/minute.png Binary files differindex 1297ec7c2b..e2f216c897 100644 --- a/examples/quick/demos/clocks/content/minute.png +++ b/examples/quick/demos/clocks/content/minute.png diff --git a/examples/quick/demos/clocks/content/second.png b/examples/quick/demos/clocks/content/second.png Binary files differindex 4aa9fb5e8e..d95d99e83d 100644 --- a/examples/quick/demos/clocks/content/second.png +++ b/examples/quick/demos/clocks/content/second.png diff --git a/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png Binary files differindex 431af8545d..23c011d0ff 100644 --- a/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/images/box-shadow.png diff --git a/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png Binary files differindex 664c2b1491..fc65122d26 100644 --- a/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/images/busy.png diff --git a/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png b/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png Binary files differindex 1847ab528d..a8a9c6079d 100644 --- a/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png +++ b/examples/quick/demos/photoviewer/PhotoViewerCore/images/cardboard.png 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 diff --git a/examples/quick/demos/stocqt/content/images/icon-left-arrow.png b/examples/quick/demos/stocqt/content/images/icon-left-arrow.png Binary files differindex 7868e8ab31..926938cadd 100644 --- a/examples/quick/demos/stocqt/content/images/icon-left-arrow.png +++ b/examples/quick/demos/stocqt/content/images/icon-left-arrow.png diff --git a/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png b/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png Binary files differindex 550c2a8a22..dc09a84dc3 100644 --- a/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png +++ b/examples/quick/demos/stocqt/doc/images/qtquick-demo-stocqt.png |
