aboutsummaryrefslogtreecommitdiffstats
path: root/src/qtquick1/util/qdeclarativefontloader.cpp
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2011-07-15 09:02:55 +1000
committerQt by Nokia <qt-info@nokia.com>2011-07-21 04:05:19 +0200
commit6b8e98aec3f382fedea704691da40376cbe88e5e (patch)
treec2d6bf149afbfe8961a49ada92c90677a8aa3845 /src/qtquick1/util/qdeclarativefontloader.cpp
parent0592e17e18e26acc177bc7556a3c9888582f0045 (diff)
Bulk update of QtQuick 1 docs to \qmlmodule syntax
Change-Id: I7ed2b54ef5a706dcaf7e19d221a6dda7b2620e8c Reviewed-on: http://codereview.qt.nokia.com/1681 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/qtquick1/util/qdeclarativefontloader.cpp')
-rw-r--r--src/qtquick1/util/qdeclarativefontloader.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/qtquick1/util/qdeclarativefontloader.cpp b/src/qtquick1/util/qdeclarativefontloader.cpp
index 38f7fc6121..25e3132df1 100644
--- a/src/qtquick1/util/qdeclarativefontloader.cpp
+++ b/src/qtquick1/util/qdeclarativefontloader.cpp
@@ -147,8 +147,9 @@ QHash<QUrl, QDeclarative1FontObject*> QDeclarative1FontLoaderPrivate::fonts;
/*!
\qmlclass FontLoader QDeclarative1FontLoader
+ \inqmlmodule QtQuick 1
\ingroup qml-utility-elements
- \since 4.7
+ \since QtQuick 1.0
\brief The FontLoader element allows fonts to be loaded by name or URL.
The FontLoader element is used to load fonts by name or URL.
@@ -181,7 +182,7 @@ QDeclarative1FontLoader::~QDeclarative1FontLoader()
}
/*!
- \qmlproperty url FontLoader::source
+ \qmlproperty url QtQuick1::FontLoader::source
The url of the font to load.
*/
QUrl QDeclarative1FontLoader::source() const
@@ -255,7 +256,7 @@ void QDeclarative1FontLoader::updateFontInfo(const QString& name, QDeclarative1F
}
/*!
- \qmlproperty string FontLoader::name
+ \qmlproperty string QtQuick1::FontLoader::name
This property holds the name of the font family.
It is set automatically when a font is loaded using the \c url property.
@@ -296,7 +297,7 @@ void QDeclarative1FontLoader::setName(const QString &name)
}
/*!
- \qmlproperty enumeration FontLoader::status
+ \qmlproperty enumeration QtQuick1::FontLoader::status
This property holds the status of font loading. It can be one of:
\list