diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-03 22:32:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-05-03 23:42:26 +0200 |
| commit | 22fc92cf9187460785a05e31620823fe8afe5eab (patch) | |
| tree | 2de1b4ccece44bac25d5689012fe7c436973b57b /src/qml/qml/qqmlengine.cpp | |
| parent | eddd6b8571eec6ab91174084eeb235d38589ca59 (diff) | |
| parent | 7224dd977163335d61ed4297341e6161bf1dbcf7 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/qml/qml/qqmlengine.cpp')
| -rw-r--r-- | src/qml/qml/qqmlengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 2b2fac0722..2e875a37fc 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -314,7 +314,7 @@ when the property has one of the following types: \li \c size - use \l{Qt::size()}{Qt.size()} \endlist -If the QtQuick module has been imported, the following helper functions for +If the \c QtQuick module has been imported, the following helper functions for creating objects of specific data types are also available for clients to use: \list \li \c color - use \l{Qt::rgba()}{Qt.rgba()}, \l{Qt::hsla()}{Qt.hsla()}, \l{Qt::darker()}{Qt.darker()}, \l{Qt::lighter()}{Qt.lighter()} or \l{Qt::tint()}{Qt.tint()} @@ -800,7 +800,7 @@ QQuickWorkerScriptEngine *QQmlEnginePrivate::getWorkerScriptEngine() In this case, the Text item will be created in the engine's \l {QQmlEngine::rootContext()}{root context}. - Note that the QtQuick 1 version is called QDeclarativeEngine. + Note that the \l {Qt Quick 1} version is called QDeclarativeEngine. \sa QQmlComponent, QQmlContext */ |