Fix license headers to match conventions.

Files updated to mtach licensing conventions for different
types, and license text updated to match current.

Change-Id: Ib2c7457fbc3b37907ab3936e176e6f16f8308036
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>

13 files changed, 16 insertions, 3 deletions

diff --git a/examples/declarative/imageelements/borderimage/main.cpp b/examples/declarative/imageelements/borderimage/main.cpp
index 9ee393f7..7c6ea6ee 100644
--- a/examples/declarative/imageelements/borderimage/main.cpp
+++ b/examples/declarative/imageelements/borderimage/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/borderimage/qml/borderimage/borderimage.qml b/examples/declarative/imageelements/borderimage/qml/borderimage/borderimage.qml
index df6af7cf..8ac03f03 100644
--- a/examples/declarative/imageelements/borderimage/qml/borderimage/borderimage.qml
+++ b/examples/declarative/imageelements/borderimage/qml/borderimage/borderimage.qml
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/borderimage/qml/borderimage/content/MyBorderImage.qml b/examples/declarative/imageelements/borderimage/qml/borderimage/content/MyBorderImage.qml
index 1454c4e6..7b3afee0 100644
--- a/examples/declarative/imageelements/borderimage/qml/borderimage/content/MyBorderImage.qml
+++ b/examples/declarative/imageelements/borderimage/qml/borderimage/content/MyBorderImage.qml
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/borderimage/qml/borderimage/content/ShadowRectangle.qml b/examples/declarative/imageelements/borderimage/qml/borderimage/content/ShadowRectangle.qml
index 438f9769..98a51a5f 100644
--- a/examples/declarative/imageelements/borderimage/qml/borderimage/content/ShadowRectangle.qml
+++ b/examples/declarative/imageelements/borderimage/qml/borderimage/content/ShadowRectangle.qml
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/borderimage/qml/borderimage/shadows.qml b/examples/declarative/imageelements/borderimage/qml/borderimage/shadows.qml
index 64232d54..854f82f0 100644
--- a/examples/declarative/imageelements/borderimage/qml/borderimage/shadows.qml
+++ b/examples/declarative/imageelements/borderimage/qml/borderimage/shadows.qml
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/image/main.cpp b/examples/declarative/imageelements/image/main.cpp
index 352a7a1a..bab1f0e8 100644
--- a/examples/declarative/imageelements/image/main.cpp
+++ b/examples/declarative/imageelements/image/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/image/qml/image/ImageCell.qml b/examples/declarative/imageelements/image/qml/image/ImageCell.qml
index 9fcdf2e6..1dd2af48 100644
--- a/examples/declarative/imageelements/image/qml/image/ImageCell.qml
+++ b/examples/declarative/imageelements/image/qml/image/ImageCell.qml
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/image/qml/image/image.qml b/examples/declarative/imageelements/image/qml/image/image.qml
index 73b8849a..6a25f4ff 100644
--- a/examples/declarative/imageelements/image/qml/image/image.qml
+++ b/examples/declarative/imageelements/image/qml/image/image.qml
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/shadows/main.cpp b/examples/declarative/imageelements/shadows/main.cpp
index 039e76cb..83dd6cdf 100644
--- a/examples/declarative/imageelements/shadows/main.cpp
+++ b/examples/declarative/imageelements/shadows/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/shadows/qml/shadows/borderimage.qml b/examples/declarative/imageelements/shadows/qml/shadows/borderimage.qml
index df6af7cf..8ac03f03 100644
--- a/examples/declarative/imageelements/shadows/qml/shadows/borderimage.qml
+++ b/examples/declarative/imageelements/shadows/qml/shadows/borderimage.qml
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/shadows/qml/shadows/content/MyBorderImage.qml b/examples/declarative/imageelements/shadows/qml/shadows/content/MyBorderImage.qml
index 1454c4e6..7b3afee0 100644
--- a/examples/declarative/imageelements/shadows/qml/shadows/content/MyBorderImage.qml
+++ b/examples/declarative/imageelements/shadows/qml/shadows/content/MyBorderImage.qml
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/shadows/qml/shadows/content/ShadowRectangle.qml b/examples/declarative/imageelements/shadows/qml/shadows/content/ShadowRectangle.qml
index 438f9769..98a51a5f 100644
--- a/examples/declarative/imageelements/shadows/qml/shadows/content/ShadowRectangle.qml
+++ b/examples/declarative/imageelements/shadows/qml/shadows/content/ShadowRectangle.qml
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
diff --git a/examples/declarative/imageelements/shadows/qml/shadows/shadows.qml b/examples/declarative/imageelements/shadows/qml/shadows/shadows.qml
index 64232d54..854f82f0 100644
--- a/examples/declarative/imageelements/shadows/qml/shadows/shadows.qml
+++ b/examples/declarative/imageelements/shadows/qml/shadows/shadows.qml
@@ -34,6 +34,7 @@
 ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/