diff options
author | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-18 13:40:01 +0200 |
---|---|---|
committer | Mitch Curtis <mitch.curtis@theqtcompany.com> | 2015-09-18 14:14:07 +0000 |
commit | 0797e0cb2072a0b5cac4d8db2205d932cc64d25c (patch) | |
tree | 103fd7a6f67a83bd7b6f44dcc9c2a67547aa2cb2 /src/imports/extras/doc/qtquickextras2.qdocconf | |
parent | 2ef6a789e9cd91a9245c65201a6fe3d3322712ad (diff) |
Merge Qt Quick Extras into Qt Quick Controls
The original split existed because the public and enterprise
controls were developed separately. Now that all controls are
public and developed together, the split no longer makes sense
and is difficult for users to understand.
Change-Id: I00420f4d09f8c837232231d03fe818b7b3403fab
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/extras/doc/qtquickextras2.qdocconf')
-rw-r--r-- | src/imports/extras/doc/qtquickextras2.qdocconf | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/src/imports/extras/doc/qtquickextras2.qdocconf b/src/imports/extras/doc/qtquickextras2.qdocconf deleted file mode 100644 index 622c7d05..00000000 --- a/src/imports/extras/doc/qtquickextras2.qdocconf +++ /dev/null @@ -1,47 +0,0 @@ -include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) - -project = QtQuickExtras2 -description = Qt Quick Extras 2 Reference Documentation -version = $QT_VERSION - -qhp.projects = QtQuickExtras2 - -qhp.QtQuickExtras2.file = qtquickextras2.qhp -qhp.QtQuickExtras2.namespace = org.qt-project.qtquickextras2.$QT_VERSION_TAG -qhp.QtQuickExtras2.virtualFolder = qtquickextras2 -qhp.QtQuickExtras2.indexTitle = Qt Quick Extras 2 -qhp.QtQuickExtras2.indexRoot = - -qhp.QtQuickExtras2.filterAttributes = qtquickextras2 $QT_VERSION qtrefdoc -qhp.QtQuickExtras2.customFilters.Qt.name = QtQuickExtras2 $QT_VERSION -qhp.QtQuickExtras2.customFilters.Qt.filterAttributes = qtquickextras2 $QT_VERSION - -qhp.QtQuickExtras2.subprojects = qtquickextras2qmltypes - -qhp.QtQuickExtras2.subprojects.qtquickextras2qmltypes.title = Extras 2 QML Types -qhp.QtQuickExtras2.subprojects.qtquickextras2qmltypes.indexTitle = Qt Quick Extras 2 QML Types -qhp.QtQuickExtras2.subprojects.qtquickextras2qmltypes.selectors = qmlclass -qhp.QtQuickExtras2.subprojects.qtquickextras2qmltypes.sortPages = true - -depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs qtquickcontrols2 - -# Specify the install path under QT_INSTALL_EXAMPLES -# Examples will be installed under quick/extras - 'extras' subdirectory -# is given as part of \example commands -exampledirs += ../ ../../../../examples/quick/extras -examplesinstallpath = quick/extras - -headerdirs += ../ -sourcedirs += ../ - -imagedirs += images - -navigation.landingpage = "Qt Quick Extras 2" -navigation.qmltypespage = "Qt Quick Extras 2 QML Types" - -tagfile = qtquickextras2.tags - -# Specify a QML module suffix, applied to html filenames, to avoid -# clashes with Qt Quick Extras 1 documentation. -outputsuffixes = QML -outputsuffixes.QML = 2 |