diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:04:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 20:41:34 +0200 |
| commit | 63ec33e79cf86c4312c58bea12a2aab400890c70 (patch) | |
| tree | 5c9b5cd51276ea0a3ca42567666a09e70efa11cc /examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png | |
| parent | b9e4a4df577959579b2322fb6077bde82d9ffce3 (diff) | |
| parent | afc84775efdc6e13e2e210bb94e115b378d90134 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4engine_p.h
Change-Id: I89ffccd699bee675732758d039e22224b275d60d
Diffstat (limited to 'examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png')
| -rw-r--r-- | examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png | bin | 11287 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png b/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png Binary files differdeleted file mode 100644 index d9e710b7e7..0000000000 --- a/examples/quick/quickwidgets/quickwidget/qtquickwidgets-example.png +++ /dev/null |
