diff options
| author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:17:06 +0200 |
|---|---|---|
| committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:21:34 +0200 |
| commit | d9e4b5c1820e62700756ede2ef5290baccc3c1b2 (patch) | |
| tree | cc6975c1bd3ea86e4b7e5373560603e5165b7ff4 /examples/qml/xmlhttprequest | |
| parent | f4d4689d3c09cb4eae30be892be426d4fa185ed4 (diff) | |
| parent | fb7ab18fa799032f37fd6f78ab34b76aff91ed6c (diff) | |
Merge branch 'stable' into release
Change-Id: I13e80072db1e2c14a37b6a123276be81b085e87e
Diffstat (limited to 'examples/qml/xmlhttprequest')
| -rw-r--r-- | examples/qml/xmlhttprequest/doc/images/qml-xmlhttprequest-example.png | bin | 0 -> 20934 bytes | |||
| -rw-r--r-- | examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc | 2 | ||||
| -rw-r--r-- | examples/qml/xmlhttprequest/get.qml | 2 | ||||
| -rw-r--r-- | examples/qml/xmlhttprequest/main.cpp | 2 | ||||
| -rw-r--r-- | examples/qml/xmlhttprequest/xmlhttprequest.qml | 2 |
5 files changed, 4 insertions, 4 deletions
diff --git a/examples/qml/xmlhttprequest/doc/images/qml-xmlhttprequest-example.png b/examples/qml/xmlhttprequest/doc/images/qml-xmlhttprequest-example.png Binary files differnew file mode 100644 index 0000000000..f585613427 --- /dev/null +++ b/examples/qml/xmlhttprequest/doc/images/qml-xmlhttprequest-example.png diff --git a/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc index 910ca99efb..ac4e33183e 100644 --- a/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc +++ b/examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. diff --git a/examples/qml/xmlhttprequest/get.qml b/examples/qml/xmlhttprequest/get.qml index 04e5950d69..0c9f1d8569 100644 --- a/examples/qml/xmlhttprequest/get.qml +++ b/examples/qml/xmlhttprequest/get.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/examples/qml/xmlhttprequest/main.cpp b/examples/qml/xmlhttprequest/main.cpp index 8bf39fcf62..a7df3fa249 100644 --- a/examples/qml/xmlhttprequest/main.cpp +++ b/examples/qml/xmlhttprequest/main.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. diff --git a/examples/qml/xmlhttprequest/xmlhttprequest.qml b/examples/qml/xmlhttprequest/xmlhttprequest.qml index b483ac1aa0..0bb4abb40b 100644 --- a/examples/qml/xmlhttprequest/xmlhttprequest.qml +++ b/examples/qml/xmlhttprequest/xmlhttprequest.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the examples of the Qt Toolkit. |
