diff options
author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-01-17 22:08:56 +0100 |
commit | 9c54d0ef8f6442e32d5762edccef46db80b68681 (patch) | |
tree | 0fdbc2be98a2e7fd7728a3860d56c94db3e173bb /tests/manual/accessibility | |
parent | 1512835ee1425a3e874d2f2dd2b01f1a1ea7b763 (diff) | |
parent | 36a42ed6b11dce102d0e0f93fbd441011b003157 (diff) |
Merge branch 'stable' into dev
Conflicts:
src/qml/doc/qtqml.qdocconf
src/quick/doc/qtquick.qdocconf
Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
Diffstat (limited to 'tests/manual/accessibility')
-rw-r--r-- | tests/manual/accessibility/animation.qml | 2 | ||||
-rw-r--r-- | tests/manual/accessibility/behavior.qml | 2 | ||||
-rw-r--r-- | tests/manual/accessibility/flickable.qml | 2 | ||||
-rw-r--r-- | tests/manual/accessibility/hittest.qml | 2 | ||||
-rw-r--r-- | tests/manual/accessibility/numberanimation.qml | 2 | ||||
-rw-r--r-- | tests/manual/accessibility/textandbuttons.qml | 2 | ||||
-rw-r--r-- | tests/manual/accessibility/transition.qml | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/tests/manual/accessibility/animation.qml b/tests/manual/accessibility/animation.qml index b193539e3e..7011acc757 100644 --- a/tests/manual/accessibility/animation.qml +++ b/tests/manual/accessibility/animation.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 QtQml module of the Qt Toolkit. diff --git a/tests/manual/accessibility/behavior.qml b/tests/manual/accessibility/behavior.qml index 9adce44eb1..ae6420c14c 100644 --- a/tests/manual/accessibility/behavior.qml +++ b/tests/manual/accessibility/behavior.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 QtQml module of the Qt Toolkit. diff --git a/tests/manual/accessibility/flickable.qml b/tests/manual/accessibility/flickable.qml index b43ec03666..5863b82f3f 100644 --- a/tests/manual/accessibility/flickable.qml +++ b/tests/manual/accessibility/flickable.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 QtQml module of the Qt Toolkit. diff --git a/tests/manual/accessibility/hittest.qml b/tests/manual/accessibility/hittest.qml index 31ef3144db..a1a337ccbe 100644 --- a/tests/manual/accessibility/hittest.qml +++ b/tests/manual/accessibility/hittest.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 QtQml module of the Qt Toolkit. diff --git a/tests/manual/accessibility/numberanimation.qml b/tests/manual/accessibility/numberanimation.qml index 93fc032d3a..2574edd106 100644 --- a/tests/manual/accessibility/numberanimation.qml +++ b/tests/manual/accessibility/numberanimation.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 QtQml module of the Qt Toolkit. diff --git a/tests/manual/accessibility/textandbuttons.qml b/tests/manual/accessibility/textandbuttons.qml index 4dd4ca8e09..2869b95e5a 100644 --- a/tests/manual/accessibility/textandbuttons.qml +++ b/tests/manual/accessibility/textandbuttons.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 QtQml module of the Qt Toolkit. diff --git a/tests/manual/accessibility/transition.qml b/tests/manual/accessibility/transition.qml index 96c54bd0a4..a8d06b38c6 100644 --- a/tests/manual/accessibility/transition.qml +++ b/tests/manual/accessibility/transition.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 QtQml module of the Qt Toolkit. |