diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 10:02:29 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-17 10:02:29 (GMT) |
| commit | 77c4df1325c4bae10c99978a325febada9fd82d0 (patch) | |
| tree | 1ce899307c51f03a73c7093477e829ae4091da78 /doc/src/snippets/declarative/integrating-javascript | |
| parent | 6c52715202ad8fd3c3f4bb94207cb7627c12f995 (diff) | |
| parent | 1e179f6c0279adefc20924731b6e8378a89131de (diff) | |
| download | Qt-77c4df1325c4bae10c99978a325febada9fd82d0.zip Qt-77c4df1325c4bae10c99978a325febada9fd82d0.tar.gz Qt-77c4df1325c4bae10c99978a325febada9fd82d0.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (74 commits)
fixed CI gate flagged spelling error: occured -> occurred
file rename
various fixes to deal with CI gate failures
Fix system proxy test: QNetworkProxyFactory::systemProxyForQuery() is static
Proper fix for QGraphicsItem crash.
Fix QSharedMemory and QSystemSemaphore autotests for Symbian
Fix QSystemSemaphore handle management issues in Symbian
Fix doc typo
Document centerIn and fill in the anchors docs
Document level of support for QGraphicsObject properties
Add an autotest for QVariant method params
Don't crash Qt Creator when debugging an object alias
Consistent Docs
QNetworkProxyFactory::systemProxyForQuery() for Symbian
Fixed build failure on platforms other than Symbian
Fix corelib def files.
Fix qglthreads test crash on Symbian
rebuild configure
Doc: Fixed a few misspellings of Flipable
Remove sqlite3_selfsigned.sis as it is no longer usable or needed.
...
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) ** |