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/auto/qml/qjsvalue | |
| 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/auto/qml/qjsvalue')
| -rw-r--r-- | tests/auto/qml/qjsvalue/tst_qjsvalue.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qjsvalue/tst_qjsvalue.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp index 156e0beeb6..49e66c08dd 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.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 test suite of the Qt Toolkit. diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.h b/tests/auto/qml/qjsvalue/tst_qjsvalue.h index ab9a5ed771..02333d0139 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.h +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.h @@ -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 test suite of the Qt Toolkit. |