diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-26 13:17:08 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-01-26 13:17:08 (GMT) |
| commit | b0390e68893dd04076434695be5e676b87bc067c (patch) | |
| tree | 60543fd8cf8c72f530a8865fa8fc2306bb52b9ba /doc/src/snippets/declarative/integrating-javascript | |
| parent | 537312d5dea24bd404666789119a5ad1bab04396 (diff) | |
| parent | 57a4353c8e082dfc0f536a1e642e4a8df0e5b9c9 (diff) | |
| download | Qt-b0390e68893dd04076434695be5e676b87bc067c.zip Qt-b0390e68893dd04076434695be5e676b87bc067c.tar.gz Qt-b0390e68893dd04076434695be5e676b87bc067c.tar.bz2 | |
Merge branch 'master' into lighthouse-master
Diffstat (limited to 'doc/src/snippets/declarative/integrating-javascript')
5 files changed, 5 insertions, 5 deletions
diff --git a/doc/src/snippets/declarative/integrating-javascript/connectjs.qml b/doc/src/snippets/declarative/integrating-javascript/connectjs.qml index d84b827..c58633e 100644 --- a/doc/src/snippets/declarative/integrating-javascript/connectjs.qml +++ b/doc/src/snippets/declarative/integrating-javascript/connectjs.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/declarative/integrating-javascript/includejs/app.qml b/doc/src/snippets/declarative/integrating-javascript/includejs/app.qml index 2ecc475..8a94628 100644 --- a/doc/src/snippets/declarative/integrating-javascript/includejs/app.qml +++ b/doc/src/snippets/declarative/integrating-javascript/includejs/app.qml @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js b/doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js index 0a01e9e..667d21a 100644 --- a/doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js +++ b/doc/src/snippets/declarative/integrating-javascript/includejs/factorial.js @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/declarative/integrating-javascript/includejs/script.js b/doc/src/snippets/declarative/integrating-javascript/includejs/script.js index 7380412..867f46f 100644 --- a/doc/src/snippets/declarative/integrating-javascript/includejs/script.js +++ b/doc/src/snippets/declarative/integrating-javascript/includejs/script.js @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** diff --git a/doc/src/snippets/declarative/integrating-javascript/script.js b/doc/src/snippets/declarative/integrating-javascript/script.js index f7099f8..1e3d1e0 100644 --- a/doc/src/snippets/declarative/integrating-javascript/script.js +++ b/doc/src/snippets/declarative/integrating-javascript/script.js @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** |