diff options
author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-18 15:34:54 +0100 |
---|---|---|
committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2015-02-18 15:35:00 +0100 |
commit | 0d3b07541a1f9136178fe0ab1f140375acb033e8 (patch) | |
tree | 344654683e5e42f889f1dff562c7130331c7e1f9 /doc/src/snippets/qlistwidget-using/mainwindow.h | |
parent | 61b6d26ddd6502e634e1db25f5ca9f7ee86c2e85 (diff) | |
parent | ebd19207b9987ceeca126ad00b9aba5b3bb26a2d (diff) | |
download | qtdoc-0d3b07541a1f9136178fe0ab1f140375acb033e8.tar.gz |
Merge remote-tracking branch 'gerrit/dev' into 5.5
Change-Id: Id8e9fc6fc2f5fc3d506da1b338e22320bdf386a1
Diffstat (limited to 'doc/src/snippets/qlistwidget-using/mainwindow.h')
-rw-r--r-- | doc/src/snippets/qlistwidget-using/mainwindow.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/snippets/qlistwidget-using/mainwindow.h b/doc/src/snippets/qlistwidget-using/mainwindow.h index 694c826a..38468645 100644 --- a/doc/src/snippets/qlistwidget-using/mainwindow.h +++ b/doc/src/snippets/qlistwidget-using/mainwindow.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. ** @@ -17,8 +17,8 @@ ** notice, this list of conditions and the following disclaimer in ** the documentation and/or other materials provided with the ** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived ** from this software without specific prior written permission. ** ** |