summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-13 00:03:52 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-13 00:03:52 +1000
commit46ecdac5c9ffb33c22d57f9249fe133aca871a3d (patch)
tree234ad13c153be1b2548d88edfca00d2a7215f445 /doc/src/snippets/code
parentc31a354bd192bfd24b0ba88add439347ac73659c (diff)
parent38ed8c2dddfe55c4a940adb534fa41ecae02af69 (diff)
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: Make QLineControl send accessibility updates. Revert "Fix double painting when adding an item into a linear layout" Fix licence headers again for MR 900 Improve invalidate() testcase. Avoid flicker when invalidate is propagated in a widget/layout hierarchy Fix licence headers again for MR 900
Diffstat (limited to 'doc/src/snippets/code')
-rw-r--r--doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp b/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp
index 8bd65208cb5..6bf6c895f6f 100644
--- a/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp
+++ b/doc/src/snippets/code/src_gui_itemviews_qidentityproxymodel.cpp
@@ -1,8 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2011 Klarälvdalens Datakonsult AB,
-** a KDAB Group company, info@kdab.com,
-** author Stephen Kelly <stephen.kelly@kdab.com>
+** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**