summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-04-07 23:59:05 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-04-07 23:59:05 (GMT)
commit99ba0cf26ddd0b45c809ae72868006eb94153545 (patch)
treea258ae81162b6e467864dde6d088df7ce37f816f /examples
parent46082389f2a700a1f98826e0c575ab4e31059761 (diff)
parent45614d67061f31dce9791293b8fde516e39037d5 (diff)
downloadQt-99ba0cf26ddd0b45c809ae72868006eb94153545.zip
Qt-99ba0cf26ddd0b45c809ae72868006eb94153545.tar.gz
Qt-99ba0cf26ddd0b45c809ae72868006eb94153545.tar.bz2
Merge remote branch 'qa-review/master' into qa-staging-master
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/righttoleft/layoutdirection/layoutdirection.qml2
-rw-r--r--examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml2
-rw-r--r--examples/declarative/righttoleft/textalignment/textalignment.qml2
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml b/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml
index b4efebe..3044430 100644
--- a/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml
+++ b/examples/declarative/righttoleft/layoutdirection/layoutdirection.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml
index 0d1b871..b4065ba 100644
--- a/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml
+++ b/examples/declarative/righttoleft/layoutmirroring/layoutmirroring.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
diff --git a/examples/declarative/righttoleft/textalignment/textalignment.qml b/examples/declarative/righttoleft/textalignment/textalignment.qml
index 4c40c3c..afd2d68 100644
--- a/examples/declarative/righttoleft/textalignment/textalignment.qml
+++ b/examples/declarative/righttoleft/textalignment/textalignment.qml
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**