From db3c9ca14983e2bdbadf9d095615c2047bbf17dc Mon Sep 17 00:00:00 2001
From: Martin Smith <martin.smith@digia.com>
Date: Wed, 20 Feb 2013 11:54:58 +0100
Subject: [PATCH] doc: Control.qml and Style.qml must have documentation
Control.qml and Style.qml must be known to qdoc, so they must have
minimal documentation to tell qdoc to ignore them because they are
internal. They must also be listed in the sources variable in the
.qdocconf file.
Task-number: QTBUG-29777
Change-Id: If601e8a52a7f1685004c03b471d2e0007fbdb5d3
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
---
src/private/Control.qml | 5 +++++
src/qtdesktop/doc/qtdesktopcomponents.qdocconf | 2 ++
src/styles/Style.qml | 7 +++++++
3 files changed, 14 insertions(+)
diff --git a/src/private/Control.qml b/src/private/Control.qml
index 5ed4233ed..4c0dad6e9 100644
--- a/src/private/Control.qml
+++ b/src/private/Control.qml
@@ -40,6 +40,11 @@
import QtQuick 2.0
import QtDesktop.Styles 1.0
+/*!
+ \qmltype Control
+ \internal
+ \inqmlmodule QtDesktop.Private 1.0
+*/
FocusScope {
id: root
diff --git a/src/qtdesktop/doc/qtdesktopcomponents.qdocconf b/src/qtdesktop/doc/qtdesktopcomponents.qdocconf
index 6a3155a48..a7f775991 100644
--- a/src/qtdesktop/doc/qtdesktopcomponents.qdocconf
+++ b/src/qtdesktop/doc/qtdesktopcomponents.qdocconf
@@ -29,6 +29,8 @@ sources += ../../private/qstyleitem.cpp \
../../private/ScrollBar.qml \
../../private/SplitterBase.qml \
../../private/TabBar.qml \
+ ../../private/Control.qml \
+ ../../styles/Style.qml \
../../styles/ButtonStyle.qml \
../../styles/CheckBoxStyle.qml \
../../styles/ComboBoxStyle.qml \
diff --git a/src/styles/Style.qml b/src/styles/Style.qml
index 859b32371..c9db6cc66 100644
--- a/src/styles/Style.qml
+++ b/src/styles/Style.qml
@@ -39,4 +39,11 @@
****************************************************************************/
import QtQuick 2.0
+
+/*!
+ \qmltype Style
+ \internal
+ \inqmlmodule QtDesktop.Styles 1.0
+*/
+
QtObject { }
--
GitLab