From a4e2cb7bae62e1f0d18e49ea0c61636348bcc21f Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Fri, 12 Feb 2016 16:54:15 +0100 Subject: Doc: update doc Qt Labs Controls Change-Id: I49a8632b0561483e6090577ae17fd7bdeb4da6ec Task-number: QTBUG-50933 Reviewed-by: J-P Nurmi --- .../qtlabscontrols-pageindicator-background.qml | 38 ++++++++++++++++++++ .../qtlabscontrols-pageindicator-contentItem.qml | 39 +++++++++++++++++++++ .../qtlabscontrols-pageindicator-delegate.qml | 40 ++++++++++++++++++++++ .../doc/snippets/qtlabscontrols-pageindicator.qml | 18 +++------- 4 files changed, 122 insertions(+), 13 deletions(-) create mode 100644 src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-background.qml create mode 100644 src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-contentItem.qml create mode 100644 src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-delegate.qml (limited to 'src/imports/controls/doc/snippets') diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-background.qml b/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-background.qml new file mode 100644 index 00000000..1c6a53b6 --- /dev/null +++ b/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-background.qml @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +PageIndicator { + count: 5 + currentIndex: 2 + background: Rectangle { + color: 'transparent' + border.color: 'red' + } +} diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-contentItem.qml new file mode 100644 index 00000000..b36b78bf --- /dev/null +++ b/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-contentItem.qml @@ -0,0 +1,39 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +PageIndicator { + count: 5 + currentIndex: 2 + Rectangle { + anchors.fill: contentItem + color: 'transparent' + border.color: 'red' + } +} diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-delegate.qml b/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-delegate.qml new file mode 100644 index 00000000..39247607 --- /dev/null +++ b/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator-delegate.qml @@ -0,0 +1,40 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://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 http://www.qt.io/terms-conditions. For further +** information use the contact form at http://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: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +PageIndicator { + count: 5 + currentIndex: 2 + Rectangle { + parent: contentItem.children[0] + anchors.fill: parent + color: 'transparent' + border.color: 'red' + } +} diff --git a/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator.qml b/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator.qml index f13e1213..c37b37c6 100644 --- a/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator.qml +++ b/src/imports/controls/doc/snippets/qtlabscontrols-pageindicator.qml @@ -24,20 +24,12 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ - import QtQuick 2.0 import Qt.labs.controls 1.0 -Frame { - width: 100 - height: 100 - - //! [1] - PageIndicator { - count: 5 - currentIndex: 2 - anchors.horizontalCenter: parent.horizontalCenter - anchors.bottom: parent.bottom - } - //! [1] +//! [1] +PageIndicator { + count: 5 + currentIndex: 2 } +//! [1] -- cgit v1.2.3