diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-10 21:27:35 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-10 21:27:35 (GMT) |
| commit | ca890a9992ae4f3439c9f5358fccc6f576e648d7 (patch) | |
| tree | 7307325c0acb7a99ab758cea99ded15ccd171bdb /doc/src/snippets/declarative/qtbinding/functions-cpp | |
| parent | 0ad5b0a3e636f95f8dfec5c8ecb39f3e85780b7f (diff) | |
| parent | 774a3536b00c4d6e4c4c10b708e31b4373a338e3 (diff) | |
| download | Qt-ca890a9992ae4f3439c9f5358fccc6f576e648d7.zip Qt-ca890a9992ae4f3439c9f5358fccc6f576e648d7.tar.gz Qt-ca890a9992ae4f3439c9f5358fccc6f576e648d7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-team: (157 commits)
Update copyright year to 2011.
Fix reversed condition introduced in 9a6cfc07e5
Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
Fix compilation error on Solaris
Check elapsed time only once
Added api for efficient data driven baseline testing
Assistant: Fix warnings.
Assistant: Don't tabify "Open Pages" dock widget by default.
QmlViewer: Remove unused class variables
Fixed bug and performance problem in windowsstyle.
Restored old flushing behavior in -graphicssystem opengl on desktop.
Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
Designer: Block QEvent::WinIdChange.
QUrl::setUrl should call detach
qkeymapper_x11.cpp: fix compilation with LSB and without XKB
tst_qscriptclass: backport test from the v8 branch
QHostInfoCache: Use QElapsedTime instead of QTime
Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file
Cocoa: add support for QEventLoop::ExcludeUserInputEvents
Updated QTOpenGL DEF files for WINSCW and ARMV5
...
Diffstat (limited to 'doc/src/snippets/declarative/qtbinding/functions-cpp')
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml b/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml index 8d8cd56..efad92a 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.qml +++ b/doc/src/snippets/declarative/qtbinding/functions-cpp/MyItem.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/qtbinding/functions-cpp/main.cpp b/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp index 91d6aec..48db128 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp +++ b/doc/src/snippets/declarative/qtbinding/functions-cpp/main.cpp @@ -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/qtbinding/functions-cpp/myclass.h b/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h index 76c628e..e428b2d 100644 --- a/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h +++ b/doc/src/snippets/declarative/qtbinding/functions-cpp/myclass.h @@ -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) ** |