aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/calendar/doc/src/qtlabscalendar-index.qdoc (renamed from src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc)0
-rw-r--r--src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc (renamed from src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc)0
-rw-r--r--src/imports/controls/doc/qtquickcontrols2.qdocconf8
-rw-r--r--src/imports/templates/doc/src/qtquicktemplates2-index.qdoc (renamed from src/imports/controls/doc/src/templates/qtquicktemplates2-index.qdoc)0
-rw-r--r--src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc (renamed from src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc)0
5 files changed, 5 insertions, 3 deletions
diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc b/src/imports/calendar/doc/src/qtlabscalendar-index.qdoc
index d99b3880..d99b3880 100644
--- a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc
+++ b/src/imports/calendar/doc/src/qtlabscalendar-index.qdoc
diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc b/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc
index a94e5ec6..a94e5ec6 100644
--- a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc
+++ b/src/imports/calendar/doc/src/qtlabscalendar-qmltypes.qdoc
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index f61fc77d..95c438a6 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -44,12 +44,14 @@ exampledirs += ../../../../examples/quickcontrols2 \
examplesinstallpath = quickcontrols2
headerdirs += ../../../quicktemplates2 \
- ../../calendar \
- ../../../quickcontrols2
+ ../../../quickcontrols2 \
+ ../../calendar
sourcedirs += ../../../quicktemplates2 \
- ../../calendar \
../../../quickcontrols2 \
+ ../../templates/doc/src \
+ ../../calendar/doc/src \
+ ../../calendar \
src
imagedirs += images
diff --git a/src/imports/controls/doc/src/templates/qtquicktemplates2-index.qdoc b/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc
index 2e22196b..2e22196b 100644
--- a/src/imports/controls/doc/src/templates/qtquicktemplates2-index.qdoc
+++ b/src/imports/templates/doc/src/qtquicktemplates2-index.qdoc
diff --git a/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc
index 977616bd..977616bd 100644
--- a/src/imports/controls/doc/src/templates/qtquicktemplates2.qdoc
+++ b/src/imports/templates/doc/src/qtquicktemplates2-qmltypes.qdoc