diff options
author | Shawn Rutledge <shawn.rutledge@digia.com> | 2013-12-16 15:22:14 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-03 17:02:18 +0100 |
commit | ba9ba084124403bd8930e29d8afcea9d64b6c0b6 (patch) | |
tree | e8c3a10eeaef753cf3c65673556bbd7f663933aa /src/dialogs/doc | |
parent | c34ce66f7b3dc7cb46d14181d46e438536a4d5f2 (diff) | |
download | qtquickcontrols-ba9ba084124403bd8930e29d8afcea9d64b6c0b6.tar.gz |
move QtQuick.Dialogs from qtdeclarative to qtquickcontrols
This will enable using Controls in the QML dialog implementations.
For now, Controls are used only as drop-in replacements for the
Button, Checkbox, and TextField which were custom implementations
in the qtdeclarative module before.
Change-Id: Ic79e9e8e5715a72ce51f4c724bfdfd33653300f2
Reviewed-by: Liang Qi <liang.qi@digia.com>
Diffstat (limited to 'src/dialogs/doc')
-rw-r--r-- | src/dialogs/doc/images/critical.png | bin | 0 -> 253 bytes | |||
-rw-r--r-- | src/dialogs/doc/images/information.png | bin | 0 -> 254 bytes | |||
-rw-r--r-- | src/dialogs/doc/images/question.png | bin | 0 -> 257 bytes | |||
-rw-r--r-- | src/dialogs/doc/images/replacefile.png | bin | 0 -> 4304 bytes | |||
-rw-r--r-- | src/dialogs/doc/images/warning.png | bin | 0 -> 224 bytes | |||
-rw-r--r-- | src/dialogs/doc/qtquickdialogs.qdocconf | 41 | ||||
-rw-r--r-- | src/dialogs/doc/src/qtquickdialogs-examples.qdoc | 36 | ||||
-rw-r--r-- | src/dialogs/doc/src/qtquickdialogs-index.qdoc | 58 |
8 files changed, 135 insertions, 0 deletions
diff --git a/src/dialogs/doc/images/critical.png b/src/dialogs/doc/images/critical.png Binary files differnew file mode 100644 index 00000000..dc9c5aeb --- /dev/null +++ b/src/dialogs/doc/images/critical.png diff --git a/src/dialogs/doc/images/information.png b/src/dialogs/doc/images/information.png Binary files differnew file mode 100644 index 00000000..0a2eb87d --- /dev/null +++ b/src/dialogs/doc/images/information.png diff --git a/src/dialogs/doc/images/question.png b/src/dialogs/doc/images/question.png Binary files differnew file mode 100644 index 00000000..2dd92fd7 --- /dev/null +++ b/src/dialogs/doc/images/question.png diff --git a/src/dialogs/doc/images/replacefile.png b/src/dialogs/doc/images/replacefile.png Binary files differnew file mode 100644 index 00000000..d1479fa9 --- /dev/null +++ b/src/dialogs/doc/images/replacefile.png diff --git a/src/dialogs/doc/images/warning.png b/src/dialogs/doc/images/warning.png Binary files differnew file mode 100644 index 00000000..cba78f6b --- /dev/null +++ b/src/dialogs/doc/images/warning.png diff --git a/src/dialogs/doc/qtquickdialogs.qdocconf b/src/dialogs/doc/qtquickdialogs.qdocconf new file mode 100644 index 00000000..47f6d41e --- /dev/null +++ b/src/dialogs/doc/qtquickdialogs.qdocconf @@ -0,0 +1,41 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) + +project = QtQuickDialogs +description = Qt Quick Dialogs Reference Documentation +url = http://qt-project.org/doc/qt-$QT_VER +version = $QT_VERSION + +qhp.projects = QtQuickDialogs + +qhp.QtQuickDialogs.file = qtquickdialogs.qhp +qhp.QtQuickDialogs.namespace = org.qt-project.qtquickdialogs.$QT_VERSION_TAG +qhp.QtQuickDialogs.virtualFolder = qtquickdialogs +qhp.QtQuickDialogs.indexTitle = Qt Quick Dialogs +qhp.QtQuickDialogs.indexRoot = + +qhp.QtQuickDialogs.filterAttributes = qtquickdialogs $QT_VERSION qtrefdoc +qhp.QtQuickDialogs.customFilters.Qt.name = QtQuickDialogs $QT_VERSION +qhp.QtQuickDialogs.customFilters.Qt.filterAttributes = qtquickdialogs $QT_VERSION + +qhp.QtQuickDialogs.subprojects = qtquickdialogsqmltypes +qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.title = QML Types +qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.indexTitle = Qt Quick Dialogs QML Types +qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.selectors = fake:qmlclass +qhp.QtQuickDialogs.subprojects.qtquickdialogsqmltypes.sortPages = true + +depends = qtqml qtquick qtgui qtwidgets qtdoc + +exampledirs += ../../../examples/quick/dialogs + +examplesinstallpath = quick/dialogs + +headerdirs += .. + +sourcedirs += .. + +imagedirs += images + +excludedirs += ../qml + +navigation.landingpage = "Qt Quick Dialogs" +navigation.qmltypespage = "Qt Quick Dialogs QML Types" diff --git a/src/dialogs/doc/src/qtquickdialogs-examples.qdoc b/src/dialogs/doc/src/qtquickdialogs-examples.qdoc new file mode 100644 index 00000000..ee277f48 --- /dev/null +++ b/src/dialogs/doc/src/qtquickdialogs-examples.qdoc @@ -0,0 +1,36 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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$ +** +****************************************************************************/ + +/*! + \group qtquickdialog_examples + \ingroup qtquickexamples + \title Qt Quick Examples - Dialogs + \brief A Collection of examples for \l{Qt Quick Dialogs}, written in QML. + + These examples show how to use the \l{Qt Quick Dialogs}. +*/ + diff --git a/src/dialogs/doc/src/qtquickdialogs-index.qdoc b/src/dialogs/doc/src/qtquickdialogs-index.qdoc new file mode 100644 index 00000000..5a1223b0 --- /dev/null +++ b/src/dialogs/doc/src/qtquickdialogs-index.qdoc @@ -0,0 +1,58 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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$ +** +****************************************************************************/ + +/*! + \group dialogs + \title Dialogs +*/ + +/*! + \page qtquickdialogs-index.html + \title Qt Quick Dialogs + + \brief Qt Quick Dialogs submodule + + The module is new in Qt 5.1. + + \section1 Dialogs + + \annotatedlist dialogs + + \section1 Related information + + \section2 Examples + \list + \li \l{Qt Quick Examples - Dialogs}{Dialogs Examples} + \endlist + + \section2 Reference + \list + \li \l{Qt Quick Dialogs QML Types}{QML Types} + \endlist + +*/ + |