aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickfontloader.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2013-10-01 13:03:28 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-02 14:40:01 +0200
commit4706b1ceff9af9141044ed3cf020ce5624bfa40f (patch)
tree43672217a945512ddd1704468d1fd4b6e9c153c7 /src/quick/util/qquickfontloader.cpp
parent4f50ab594aa2fb1d38981127beca634ad3396489 (diff)
qdoc: no longer recognizes the version nr in QML refs
All QML references of the form <QML-module-name><QML-module-version>::<QML-type>::<member-name> have had the <QML-module-version> removed i. Task-number: QTBUG-33776 Change-Id: Idde279e0f254cd24ea44f9841662dd81a2c5bbc6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/quick/util/qquickfontloader.cpp')
-rw-r--r--src/quick/util/qquickfontloader.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp
index b3f5615864..c0672359ef 100644
--- a/src/quick/util/qquickfontloader.cpp
+++ b/src/quick/util/qquickfontloader.cpp
@@ -182,7 +182,7 @@ QQuickFontLoader::~QQuickFontLoader()
}
/*!
- \qmlproperty url QtQuick2::FontLoader::source
+ \qmlproperty url QtQuick::FontLoader::source
The url of the font to load.
*/
QUrl QQuickFontLoader::source() const
@@ -253,7 +253,7 @@ void QQuickFontLoader::updateFontInfo(const QString& name, QQuickFontLoader::Sta
}
/*!
- \qmlproperty string QtQuick2::FontLoader::name
+ \qmlproperty string QtQuick::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.
@@ -294,7 +294,7 @@ void QQuickFontLoader::setName(const QString &name)
}
/*!
- \qmlproperty enumeration QtQuick2::FontLoader::status
+ \qmlproperty enumeration QtQuick::FontLoader::status
This property holds the status of font loading. It can be one of:
\list