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/integrating-javascript | |
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/integrating-javascript')
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/snippets/qtquick1/integrating-javascript/connectjs.qml b/doc/src/snippets/qtquick1/integrating-javascript/connectjs.qml index c940456668..d92532b2ce 100644 --- a/doc/src/snippets/qtquick1/integrating-javascript/connectjs.qml +++ b/doc/src/snippets/qtquick1/integrating-javascript/connectjs.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/integrating-javascript/includejs/app.qml b/doc/src/snippets/qtquick1/integrating-javascript/includejs/app.qml index 32366135fe..845df9568e 100644 --- a/doc/src/snippets/qtquick1/integrating-javascript/includejs/app.qml +++ b/doc/src/snippets/qtquick1/integrating-javascript/includejs/app.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/integrating-javascript/includejs/factorial.js b/doc/src/snippets/qtquick1/integrating-javascript/includejs/factorial.js index 310bd3ecac..272110d82b 100644 --- a/doc/src/snippets/qtquick1/integrating-javascript/includejs/factorial.js +++ b/doc/src/snippets/qtquick1/integrating-javascript/includejs/factorial.js @@ -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/integrating-javascript/includejs/script.js b/doc/src/snippets/qtquick1/integrating-javascript/includejs/script.js index 8fdaa71243..010f986670 100644 --- a/doc/src/snippets/qtquick1/integrating-javascript/includejs/script.js +++ b/doc/src/snippets/qtquick1/integrating-javascript/includejs/script.js @@ -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/integrating-javascript/script.js b/doc/src/snippets/qtquick1/integrating-javascript/script.js index bc2e31c609..c32d801b80 100644 --- a/doc/src/snippets/qtquick1/integrating-javascript/script.js +++ b/doc/src/snippets/qtquick1/integrating-javascript/script.js @@ -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. ** |