aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/imports/timeline/doc/qtquicktimeline.qdocconf2
-rw-r--r--src/imports/timeline/qquickkeyframe.cpp4
-rw-r--r--src/imports/timeline/qquicktimeline.cpp2
-rw-r--r--src/imports/timeline/qquicktimelineanimation.cpp2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/imports/timeline/doc/qtquicktimeline.qdocconf b/src/imports/timeline/doc/qtquicktimeline.qdocconf
index 0e37214..104ffb6 100644
--- a/src/imports/timeline/doc/qtquicktimeline.qdocconf
+++ b/src/imports/timeline/doc/qtquicktimeline.qdocconf
@@ -35,7 +35,7 @@ sourcedirs += ..
#exampledirs =
imagedirs += images \
-depends += qtcore qtdoc qtquick
+depends += qtcore qtdoc qtqml qtquick
tagfile = qtquicktimeline.tags
diff --git a/src/imports/timeline/qquickkeyframe.cpp b/src/imports/timeline/qquickkeyframe.cpp
index db70e66..c24335f 100644
--- a/src/imports/timeline/qquickkeyframe.cpp
+++ b/src/imports/timeline/qquickkeyframe.cpp
@@ -183,7 +183,7 @@ public:
/*!
\qmltype Keyframe
- \inherits QObject
+ \inherits QtObject
\instantiates QQuickKeyframe
\inqmlmodule QtQuick.Timeline
\ingroup qtqmltypes
@@ -257,7 +257,7 @@ QQuickKeyframe::QQuickKeyframe(QQuickKeyframePrivate &dd, QObject *parent)
/*!
\qmltype KeyframeGroup
- \inherits QObject
+ \inherits QtObject
\instantiates QQuickKeyframeGroup
\inqmlmodule QtQuick.Timeline
\ingroup qtqmltypes
diff --git a/src/imports/timeline/qquicktimeline.cpp b/src/imports/timeline/qquicktimeline.cpp
index 527c800..1c46b37 100644
--- a/src/imports/timeline/qquicktimeline.cpp
+++ b/src/imports/timeline/qquicktimeline.cpp
@@ -139,7 +139,7 @@ void QQuickTimelinePrivate::clear_animations(QQmlListProperty<QQuickTimelineAnim
/*!
\qmltype Timeline
- \inherits QObject
+ \inherits QtObject
\instantiates QQuickTimeline
\inqmlmodule QtQuick.Timeline
\ingroup qtqmltypes
diff --git a/src/imports/timeline/qquicktimelineanimation.cpp b/src/imports/timeline/qquicktimelineanimation.cpp
index fcdace1..1e19a34 100644
--- a/src/imports/timeline/qquicktimelineanimation.cpp
+++ b/src/imports/timeline/qquicktimelineanimation.cpp
@@ -40,7 +40,7 @@ QT_BEGIN_NAMESPACE
/*!
\qmltype TimelineAnimation
- \inherits QQuickNumberAnimation
+ \inherits NumberAnimation
\instantiates QQuickTimelineAnimation
\inqmlmodule QtQuick.Timeline
\ingroup qtqmltypes