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/qml | |
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/qml')
-rw-r--r-- | examples/qml/dynamicscene/content/images/star.png | bin | 349 -> 259 bytes |
-rw-r--r-- | examples/qml/dynamicscene/content/images/sun.png | bin | 8153 -> 8110 bytes |
-rw-r--r-- | examples/qml/qmlextensionplugins/imports/TimeExample/hour.png | bin | 625 -> 518 bytes |
-rw-r--r-- | examples/qml/qmlextensionplugins/imports/TimeExample/minute.png | bin | 625 -> 528 bytes |
4 files changed, 0 insertions, 0 deletions
diff --git a/examples/qml/dynamicscene/content/images/star.png b/examples/qml/dynamicscene/content/images/star.png Binary files differindex 27ef924267..bdcd36909d 100644 --- a/examples/qml/dynamicscene/content/images/star.png +++ b/examples/qml/dynamicscene/content/images/star.png diff --git a/examples/qml/dynamicscene/content/images/sun.png b/examples/qml/dynamicscene/content/images/sun.png Binary files differindex 7713ca5ce7..c5fd36ed39 100644 --- a/examples/qml/dynamicscene/content/images/sun.png +++ b/examples/qml/dynamicscene/content/images/sun.png diff --git a/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png b/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png Binary files differindex f8061a1235..9f33fc5d48 100644 --- a/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png +++ b/examples/qml/qmlextensionplugins/imports/TimeExample/hour.png diff --git a/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png b/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png Binary files differindex 1297ec7c2b..e2f216c897 100644 --- a/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png +++ b/examples/qml/qmlextensionplugins/imports/TimeExample/minute.png |