diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 01:00:35 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-09-25 01:00:35 +0200 |
commit | 35ec3b49e1b0e7c72643a4e5b835bff57762f8cb (patch) | |
tree | 97bc6a16cca64905434647f810635cb143ad9aac /doc/src/examples/flickable.qdoc | |
parent | 8bd0e6709f733a4934f32b4bd455eb1a46ff02d6 (diff) | |
parent | 2e94947c5602800b540fdabbb9c058a63f13e9d0 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I65e4457a218f333161e9e72735b62fc821475f45
Diffstat (limited to 'doc/src/examples/flickable.qdoc')
-rw-r--r-- | doc/src/examples/flickable.qdoc | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/doc/src/examples/flickable.qdoc b/doc/src/examples/flickable.qdoc deleted file mode 100644 index f289f421c3..0000000000 --- a/doc/src/examples/flickable.qdoc +++ /dev/null @@ -1,33 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example embedded/flickable - \title Flickable List - - \image flickable-demo.png -*/ |