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/focus | |
| 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/focus')
8 files changed, 8 insertions, 8 deletions
diff --git a/doc/src/snippets/qtquick1/focus/MyClickableWidget.qml b/doc/src/snippets/qtquick1/focus/MyClickableWidget.qml index 281f915eb4..1a2a4d0b0a 100644 --- a/doc/src/snippets/qtquick1/focus/MyClickableWidget.qml +++ b/doc/src/snippets/qtquick1/focus/MyClickableWidget.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/focus/MyWidget.qml b/doc/src/snippets/qtquick1/focus/MyWidget.qml index b0724e306e..f528716854 100644 --- a/doc/src/snippets/qtquick1/focus/MyWidget.qml +++ b/doc/src/snippets/qtquick1/focus/MyWidget.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/focus/advancedFocus.qml b/doc/src/snippets/qtquick1/focus/advancedFocus.qml index 7f61e5c3c0..a32be23af5 100644 --- a/doc/src/snippets/qtquick1/focus/advancedFocus.qml +++ b/doc/src/snippets/qtquick1/focus/advancedFocus.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/focus/basicwidget.qml b/doc/src/snippets/qtquick1/focus/basicwidget.qml index 8728229d40..7abb009465 100644 --- a/doc/src/snippets/qtquick1/focus/basicwidget.qml +++ b/doc/src/snippets/qtquick1/focus/basicwidget.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/focus/clickablewidget.qml b/doc/src/snippets/qtquick1/focus/clickablewidget.qml index ee9d98937d..cb2de0ec32 100644 --- a/doc/src/snippets/qtquick1/focus/clickablewidget.qml +++ b/doc/src/snippets/qtquick1/focus/clickablewidget.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 FOO module of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/focus/myfocusscopewidget.qml b/doc/src/snippets/qtquick1/focus/myfocusscopewidget.qml index 0e0f1b716c..8c7e355de1 100644 --- a/doc/src/snippets/qtquick1/focus/myfocusscopewidget.qml +++ b/doc/src/snippets/qtquick1/focus/myfocusscopewidget.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/focus/rectangle.qml b/doc/src/snippets/qtquick1/focus/rectangle.qml index 942fc6e73f..58b3eeac24 100644 --- a/doc/src/snippets/qtquick1/focus/rectangle.qml +++ b/doc/src/snippets/qtquick1/focus/rectangle.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 FOO module of the Qt Toolkit. ** diff --git a/doc/src/snippets/qtquick1/focus/widget.qml b/doc/src/snippets/qtquick1/focus/widget.qml index 72b46ed590..6dff3b82e7 100644 --- a/doc/src/snippets/qtquick1/focus/widget.qml +++ b/doc/src/snippets/qtquick1/focus/widget.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. ** |