diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-09 03:31:00 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-09 03:31:00 (GMT) |
| commit | 8c836fa76043c55432dd4b2a1669a895e0758925 (patch) | |
| tree | aeb253c2624ce77f92d36f70a3d79594ea15a38b /src/gui | |
| parent | 53f053d311798ba28af5602f1d9755c61c9a0549 (diff) | |
| parent | 99ba0cf26ddd0b45c809ae72868006eb94153545 (diff) | |
| download | Qt-8c836fa76043c55432dd4b2a1669a895e0758925.zip Qt-8c836fa76043c55432dd4b2a1669a895e0758925.tar.gz Qt-8c836fa76043c55432dd4b2a1669a895e0758925.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
Fix typos in QSharedPointer documentation.
Remove test for compiler correctness
Refactor qpointer dereference tests
Prefer QCOMPARE to QVERIFY for comparisons.
Improve coverage of qpointer autotest
Add comments, eliminate duplication in qpointer autotest.
Remove redundant includes and functions from qpointer autotest.
Fix tst_XmlPatterns::xquerySupport() autotest
Update copyright year to 2011.
BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qplatformnativeinterface_qpa.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformnativeinterface_qpa.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformnativeinterface_qpa.cpp b/src/gui/kernel/qplatformnativeinterface_qpa.cpp index ace4a7b..281aeba 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.cpp +++ b/src/gui/kernel/qplatformnativeinterface_qpa.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/src/gui/kernel/qplatformnativeinterface_qpa.h b/src/gui/kernel/qplatformnativeinterface_qpa.h index 5ea2c13..b9d0619 100644 --- a/src/gui/kernel/qplatformnativeinterface_qpa.h +++ b/src/gui/kernel/qplatformnativeinterface_qpa.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) ** |