aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2016-01-14 12:59:43 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2016-01-19 14:22:15 +0000
commit60e91559dddb5d75dc308986b009bc82e7a0080c (patch)
tree24410dce1dce3f288a781713e1419b1eb3708497 /src/imports
parentd690010c3ab0780cffb341b185a0e29edb80c678 (diff)
Docs: add notes about the Qt.labs module
Change-Id: I65c37f661689bf30e7a9119bb877dce68eeb634c Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/calendar/qquickcalendarmodel.cpp2
-rw-r--r--src/imports/calendar/qquickdayofweekrow.cpp2
-rw-r--r--src/imports/calendar/qquickmonthgrid.cpp2
-rw-r--r--src/imports/calendar/qquickweeknumbercolumn.cpp2
-rw-r--r--src/imports/controls/doc/qtlabscontrols.qdocconf2
-rw-r--r--src/imports/controls/doc/src/qtlabscontrols-material.qdoc2
-rw-r--r--src/imports/controls/doc/src/qtlabscontrols-universal.qdoc2
-rw-r--r--src/imports/controls/doc/src/qtlabscontrols.qdoc2
-rw-r--r--src/imports/controls/doc/src/templates/qtlabstemplates.qdoc2
9 files changed, 18 insertions, 0 deletions
diff --git a/src/imports/calendar/qquickcalendarmodel.cpp b/src/imports/calendar/qquickcalendarmodel.cpp
index 832513d7..6b59d45a 100644
--- a/src/imports/calendar/qquickcalendarmodel.cpp
+++ b/src/imports/calendar/qquickcalendarmodel.cpp
@@ -60,6 +60,8 @@ QT_BEGIN_NAMESPACE
\row \li \b model.year : int \li The number of the year
\endtable
+ \labs
+
\sa MonthGrid
*/
diff --git a/src/imports/calendar/qquickdayofweekrow.cpp b/src/imports/calendar/qquickdayofweekrow.cpp
index 8788ac95..76bcf5df 100644
--- a/src/imports/calendar/qquickdayofweekrow.cpp
+++ b/src/imports/calendar/qquickdayofweekrow.cpp
@@ -64,6 +64,8 @@ QT_BEGIN_NAMESPACE
The visual appearance of DayOfWeekRow can be changed by
implementing a \l {delegate}{custom delegate}.
+ \labs
+
\sa MonthGrid, WeekNumberColumn
*/
diff --git a/src/imports/calendar/qquickmonthgrid.cpp b/src/imports/calendar/qquickmonthgrid.cpp
index a3a58eab..fd2909f8 100644
--- a/src/imports/calendar/qquickmonthgrid.cpp
+++ b/src/imports/calendar/qquickmonthgrid.cpp
@@ -68,6 +68,8 @@ QT_BEGIN_NAMESPACE
The visual appearance of MonthGrid can be changed by
implementing a \l {delegate}{custom delegate}.
+ \labs
+
\sa DayOfWeekRow, WeekNumberColumn, CalendarModel
*/
diff --git a/src/imports/calendar/qquickweeknumbercolumn.cpp b/src/imports/calendar/qquickweeknumbercolumn.cpp
index 04890411..3e8f1a6b 100644
--- a/src/imports/calendar/qquickweeknumbercolumn.cpp
+++ b/src/imports/calendar/qquickweeknumbercolumn.cpp
@@ -66,6 +66,8 @@ QT_BEGIN_NAMESPACE
The visual appearance of WeekNumberColumn can be changed by
implementing a \l {delegate}{custom delegate}.
+ \labs
+
\sa MonthGrid, DayOfWeekRow
*/
diff --git a/src/imports/controls/doc/qtlabscontrols.qdocconf b/src/imports/controls/doc/qtlabscontrols.qdocconf
index df004294..cfd5ec55 100644
--- a/src/imports/controls/doc/qtlabscontrols.qdocconf
+++ b/src/imports/controls/doc/qtlabscontrols.qdocconf
@@ -60,3 +60,5 @@ macro.styleimport.HTML = "<table class=\"alignedsummary\"><tbody><tr><td class=\
# \endstyleproperty
macro.styleproperty.HTML = "<div class=\"qmlproto\"><table class=\"qmlname\"><tbody><tr valign=\"top\" class=\"odd\" id=\"\3\"><td class=\"tblQmlPropNode\"><p><span class=\"name\">\1</span> : <span class=\"type\">\2</span></p></td></tr></tbody></table></div>"
macro.endstyleproperty = "\\br"
+
+macro.labs = "\\note \\e{Types in the Qt.labs module are not guaranteed to remain compatible in future versions.}"
diff --git a/src/imports/controls/doc/src/qtlabscontrols-material.qdoc b/src/imports/controls/doc/src/qtlabscontrols-material.qdoc
index f9b6a008..2de27f18 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-material.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-material.qdoc
@@ -123,6 +123,8 @@
of explicit Material style-specific references, the Material style must
be deployed with the application.
+ \labs
+
\section1 Attached Property Documentation
\styleproperty {Material.accent} {color} {accent-attached-prop}
diff --git a/src/imports/controls/doc/src/qtlabscontrols-universal.qdoc b/src/imports/controls/doc/src/qtlabscontrols-universal.qdoc
index 3c616d84..bf3dcfdc 100644
--- a/src/imports/controls/doc/src/qtlabscontrols-universal.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols-universal.qdoc
@@ -124,6 +124,8 @@
of explicit Universal style-specific references, the Universal style must
be deployed with the application.
+ \labs
+
\section1 Attached Property Documentation
\styleproperty {Universal.accent} {color} {accent-attached-prop}
diff --git a/src/imports/controls/doc/src/qtlabscontrols.qdoc b/src/imports/controls/doc/src/qtlabscontrols.qdoc
index 10476f08..17e93a44 100644
--- a/src/imports/controls/doc/src/qtlabscontrols.qdoc
+++ b/src/imports/controls/doc/src/qtlabscontrols.qdoc
@@ -49,6 +49,8 @@
import Qt.labs.calendar 1.0
\endcode
+ \labs
+
\section1 QML Types
\section2 Qt.labs.controls Module
diff --git a/src/imports/controls/doc/src/templates/qtlabstemplates.qdoc b/src/imports/controls/doc/src/templates/qtlabstemplates.qdoc
index 84eabe44..0f7f7d86 100644
--- a/src/imports/controls/doc/src/templates/qtlabstemplates.qdoc
+++ b/src/imports/controls/doc/src/templates/qtlabstemplates.qdoc
@@ -41,6 +41,8 @@
import Qt.labs.templates 1.0 as T
\endcode
+ \labs
+
For the sake of clarity, there is a one-to-one mapping between the types
provided by the \c Qt.labs.templates and \c Qt.labs.controls imports. For
every type available in the \c Qt.labs.controls import, a non-visual template