diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /doc/src/snippets/qtquick1/loader | |
parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'doc/src/snippets/qtquick1/loader')
-rw-r--r-- | doc/src/snippets/qtquick1/loader/KeyReader.qml | 2 | ||||
-rw-r--r-- | doc/src/snippets/qtquick1/loader/MyItem.qml | 2 | ||||
-rw-r--r-- | doc/src/snippets/qtquick1/loader/connections.qml | 2 | ||||
-rw-r--r-- | doc/src/snippets/qtquick1/loader/focus.qml | 2 | ||||
-rw-r--r-- | doc/src/snippets/qtquick1/loader/simple.qml | 2 | ||||
-rw-r--r-- | doc/src/snippets/qtquick1/loader/sizeitem.qml | 2 | ||||
-rw-r--r-- | doc/src/snippets/qtquick1/loader/sizeloader.qml | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/snippets/qtquick1/loader/KeyReader.qml b/doc/src/snippets/qtquick1/loader/KeyReader.qml index 2667486bc1..a3687fe53f 100644 --- a/doc/src/snippets/qtquick1/loader/KeyReader.qml +++ b/doc/src/snippets/qtquick1/loader/KeyReader.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/loader/MyItem.qml b/doc/src/snippets/qtquick1/loader/MyItem.qml index 656acd40da..ab84f6dd4f 100644 --- a/doc/src/snippets/qtquick1/loader/MyItem.qml +++ b/doc/src/snippets/qtquick1/loader/MyItem.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/loader/connections.qml b/doc/src/snippets/qtquick1/loader/connections.qml index 29d31ac891..3db309d924 100644 --- a/doc/src/snippets/qtquick1/loader/connections.qml +++ b/doc/src/snippets/qtquick1/loader/connections.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/loader/focus.qml b/doc/src/snippets/qtquick1/loader/focus.qml index 2f12c2153d..bc2a6e120a 100644 --- a/doc/src/snippets/qtquick1/loader/focus.qml +++ b/doc/src/snippets/qtquick1/loader/focus.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/loader/simple.qml b/doc/src/snippets/qtquick1/loader/simple.qml index 4e1b1d8d04..518a6d923c 100644 --- a/doc/src/snippets/qtquick1/loader/simple.qml +++ b/doc/src/snippets/qtquick1/loader/simple.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/loader/sizeitem.qml b/doc/src/snippets/qtquick1/loader/sizeitem.qml index 983b8678ce..bdd85a01d6 100644 --- a/doc/src/snippets/qtquick1/loader/sizeitem.qml +++ b/doc/src/snippets/qtquick1/loader/sizeitem.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/loader/sizeloader.qml b/doc/src/snippets/qtquick1/loader/sizeloader.qml index 7f0fa21e9c..080169ee45 100644 --- a/doc/src/snippets/qtquick1/loader/sizeloader.qml +++ b/doc/src/snippets/qtquick1/loader/sizeloader.qml @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the documentation of the Qt Toolkit. ** |