diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:04:56 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-01-07 11:04:56 +0100 |
commit | b699ccaa94f0372b7a74ba2875aae48958744cf8 (patch) | |
tree | 0afb1240a518aff3d8252fb657e8c4f6587f3453 | |
parent | 27dc631a58a456afe86b3553a81f4f2dea75e588 (diff) | |
parent | 12db3790eef4ba140528438a650a68777b1ed26d (diff) | |
download | qtdoc-b699ccaa94f0372b7a74ba2875aae48958744cf8.tar.gz |
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ia5ef425ae05c8f4d007691cb12298b74078ea9fc
-rw-r--r-- | doc/src/snippets/qlistview-using/model.cpp | 10 | ||||
-rw-r--r-- | doc/src/snippets/qlistview-using/model.h | 10 | ||||
-rw-r--r-- | doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp | 10 |
3 files changed, 0 insertions, 30 deletions
diff --git a/doc/src/snippets/qlistview-using/model.cpp b/doc/src/snippets/qlistview-using/model.cpp index 6b80d033..2632ed89 100644 --- a/doc/src/snippets/qlistview-using/model.cpp +++ b/doc/src/snippets/qlistview-using/model.cpp @@ -38,16 +38,6 @@ ** ****************************************************************************/ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of an example program for Qt. -** EDITIONS: NOLIMITS -** -****************************************************************************/ - /* model.cpp diff --git a/doc/src/snippets/qlistview-using/model.h b/doc/src/snippets/qlistview-using/model.h index e4b83899..043ceb7a 100644 --- a/doc/src/snippets/qlistview-using/model.h +++ b/doc/src/snippets/qlistview-using/model.h @@ -38,16 +38,6 @@ ** ****************************************************************************/ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of an example program for Qt. -** EDITIONS: NOLIMITS -** -****************************************************************************/ - #ifndef MODEL_H #define MODEL_H diff --git a/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp b/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp index f4c0a5e2..92ee2ee7 100644 --- a/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp +++ b/doc/src/snippets/qtreeview-dnd/dragdropmodel.cpp @@ -38,16 +38,6 @@ ** ****************************************************************************/ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of an example program for Qt. -** EDITIONS: NOLIMITS -** -****************************************************************************/ - #include <QtGui> #include "dragdropmodel.h" |