diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:11:10 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-10 10:11:11 +0200 |
| commit | f035786021e9f7b1d9512b22774bc15553caaedb (patch) | |
| tree | c46a29ed3657944d9f36d8643a99fad469235bc4 /examples | |
| parent | 72024fd50cdead8d890886dba32fd81ac54ff3ae (diff) | |
| parent | 916c9d469bd0df227dc3be97fcca27e3cf58144f (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: Ia12ffdb27ecdf25c2a2bdb0eed1945387502108a
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/xml/saxbookmarks/doc/images/saxbookmarks-example.png (renamed from examples/xml/doc/images/saxbookmarks-example.png) | bin | 26219 -> 26219 bytes | |||
| -rw-r--r-- | examples/xml/saxbookmarks/doc/src/saxbookmarks.qdoc (renamed from examples/xml/doc/src/saxbookmarks.qdoc) | 0 | ||||
| -rw-r--r-- | examples/xml/streambookmarks/doc/images/xmlstreamexample-filemenu.png (renamed from examples/xml/doc/images/xmlstreamexample-filemenu.png) | bin | 9380 -> 9380 bytes | |||
| -rw-r--r-- | examples/xml/streambookmarks/doc/images/xmlstreamexample-helpmenu.png (renamed from examples/xml/doc/images/xmlstreamexample-helpmenu.png) | bin | 10856 -> 10856 bytes | |||
| -rw-r--r-- | examples/xml/streambookmarks/doc/images/xmlstreamexample-screenshot.png (renamed from examples/xml/doc/images/xmlstreamexample-screenshot.png) | bin | 22323 -> 22323 bytes | |||
| -rw-r--r-- | examples/xml/streambookmarks/doc/src/qxmlstreambookmarks.qdoc (renamed from examples/xml/doc/src/qxmlstreambookmarks.qdoc) | 0 |
6 files changed, 0 insertions, 0 deletions
diff --git a/examples/xml/doc/images/saxbookmarks-example.png b/examples/xml/saxbookmarks/doc/images/saxbookmarks-example.png Binary files differindex 54d793be56..54d793be56 100644 --- a/examples/xml/doc/images/saxbookmarks-example.png +++ b/examples/xml/saxbookmarks/doc/images/saxbookmarks-example.png diff --git a/examples/xml/doc/src/saxbookmarks.qdoc b/examples/xml/saxbookmarks/doc/src/saxbookmarks.qdoc index 4612a1c302..4612a1c302 100644 --- a/examples/xml/doc/src/saxbookmarks.qdoc +++ b/examples/xml/saxbookmarks/doc/src/saxbookmarks.qdoc diff --git a/examples/xml/doc/images/xmlstreamexample-filemenu.png b/examples/xml/streambookmarks/doc/images/xmlstreamexample-filemenu.png Binary files differindex e074fb7c41..e074fb7c41 100644 --- a/examples/xml/doc/images/xmlstreamexample-filemenu.png +++ b/examples/xml/streambookmarks/doc/images/xmlstreamexample-filemenu.png diff --git a/examples/xml/doc/images/xmlstreamexample-helpmenu.png b/examples/xml/streambookmarks/doc/images/xmlstreamexample-helpmenu.png Binary files differindex 0dc4392b94..0dc4392b94 100644 --- a/examples/xml/doc/images/xmlstreamexample-helpmenu.png +++ b/examples/xml/streambookmarks/doc/images/xmlstreamexample-helpmenu.png diff --git a/examples/xml/doc/images/xmlstreamexample-screenshot.png b/examples/xml/streambookmarks/doc/images/xmlstreamexample-screenshot.png Binary files differindex bbaa423061..bbaa423061 100644 --- a/examples/xml/doc/images/xmlstreamexample-screenshot.png +++ b/examples/xml/streambookmarks/doc/images/xmlstreamexample-screenshot.png diff --git a/examples/xml/doc/src/qxmlstreambookmarks.qdoc b/examples/xml/streambookmarks/doc/src/qxmlstreambookmarks.qdoc index 123058b02d..123058b02d 100644 --- a/examples/xml/doc/src/qxmlstreambookmarks.qdoc +++ b/examples/xml/streambookmarks/doc/src/qxmlstreambookmarks.qdoc |
