diff options
author | Alan Alpert <aalpert@rim.com> | 2012-12-24 08:48:49 -0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 17:11:22 +0100 |
commit | b700796884d29f1947194553c0103b5390b6bd42 (patch) | |
tree | 2c828c83f960153bb0862c7c91956d17739a5928 /src/qml | |
parent | 40574b466a5773fdb7ccddded45e237df375d848 (diff) |
Move documentation to QtQml module
The recent move of certain elements from the QtQuick module forgot to
update the module in some of the documentation strings.
Change-Id: I5da27772004c7ceeb9c5ab6184e0078ac64ba07a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/qml/qqmlbind.cpp | 10 | ||||
-rw-r--r-- | src/qml/qml/qqmlconnections.cpp | 6 | ||||
-rw-r--r-- | src/qml/qml/qqmltimer.cpp | 18 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/qml/qml/qqmlbind.cpp b/src/qml/qml/qqmlbind.cpp index 7eb182b034..fcb3079891 100644 --- a/src/qml/qml/qqmlbind.cpp +++ b/src/qml/qml/qqmlbind.cpp @@ -77,7 +77,7 @@ public: /*! \qmltype Binding \instantiates QQmlBind - \inqmlmodule QtQuick 2 + \inqmlmodule QtQml 2 \ingroup qtquick-interceptors \brief Enables the arbitrary creation of property bindings @@ -151,7 +151,7 @@ QQmlBind::~QQmlBind() } /*! - \qmlproperty bool QtQuick2::Binding::when + \qmlproperty bool QtQml2::Binding::when This property holds when the binding is active. This should be set to an expression that evaluates to true when you want the binding to be active. @@ -183,7 +183,7 @@ void QQmlBind::setWhen(bool v) } /*! - \qmlproperty Object QtQuick2::Binding::target + \qmlproperty Object QtQml2::Binding::target The object to be updated. */ @@ -210,7 +210,7 @@ void QQmlBind::setObject(QObject *obj) } /*! - \qmlproperty string QtQuick2::Binding::property + \qmlproperty string QtQml2::Binding::property The property to be updated. */ @@ -237,7 +237,7 @@ void QQmlBind::setProperty(const QString &p) } /*! - \qmlproperty any QtQuick2::Binding::value + \qmlproperty any QtQml2::Binding::value The value to be set on the target object and property. This can be a constant (which isn't very useful), or a bound expression. diff --git a/src/qml/qml/qqmlconnections.cpp b/src/qml/qml/qqmlconnections.cpp index f2d29bf393..286933e557 100644 --- a/src/qml/qml/qqmlconnections.cpp +++ b/src/qml/qml/qqmlconnections.cpp @@ -73,7 +73,7 @@ public: /*! \qmltype Connections \instantiates QQmlConnections - \inqmlmodule QtQuick 2 + \inqmlmodule QtQml 2 \ingroup qtquick-interceptors \brief Describes generalized connections to signals @@ -138,7 +138,7 @@ QQmlConnections::~QQmlConnections() } /*! - \qmlproperty Object QtQuick2::Connections::target + \qmlproperty Object QtQml2::Connections::target This property holds the object that sends the signal. If this property is not set, the \c target defaults to the parent of the Connection. @@ -183,7 +183,7 @@ void QQmlConnections::setTarget(QObject *obj) } /*! - \qmlproperty bool QtQuick2::Connections::ignoreUnknownSignals + \qmlproperty bool QtQml2::Connections::ignoreUnknownSignals Normally, a connection to a non-existent signal produces runtime errors. diff --git a/src/qml/qml/qqmltimer.cpp b/src/qml/qml/qqmltimer.cpp index c9f6bc7982..a1cb8532f7 100644 --- a/src/qml/qml/qqmltimer.cpp +++ b/src/qml/qml/qqmltimer.cpp @@ -75,7 +75,7 @@ public: /*! \qmltype Timer \instantiates QQmlTimer - \inqmlmodule QtQuick 2 + \inqmlmodule QtQml 2 \ingroup qtquick-interceptors \brief Triggers a handler at a specified interval @@ -122,7 +122,7 @@ QQmlTimer::QQmlTimer(QObject *parent) } /*! - \qmlproperty int QtQuick2::Timer::interval + \qmlproperty int QtQml2::Timer::interval Sets the \a interval between triggers, in milliseconds. @@ -145,7 +145,7 @@ int QQmlTimer::interval() const } /*! - \qmlproperty bool QtQuick2::Timer::running + \qmlproperty bool QtQml2::Timer::running If set to true, starts the timer; otherwise stops the timer. For a non-repeating timer, \a running is set to false after the @@ -173,7 +173,7 @@ void QQmlTimer::setRunning(bool running) } /*! - \qmlproperty bool QtQuick2::Timer::repeat + \qmlproperty bool QtQml2::Timer::repeat If \a repeat is true the timer is triggered repeatedly at the specified interval; otherwise, the timer will trigger once at the @@ -200,7 +200,7 @@ void QQmlTimer::setRepeating(bool repeating) } /*! - \qmlproperty bool QtQuick2::Timer::triggeredOnStart + \qmlproperty bool QtQml2::Timer::triggeredOnStart When a timer is started, the first trigger is usually after the specified interval has elapsed. It is sometimes desirable to trigger immediately @@ -233,7 +233,7 @@ void QQmlTimer::setTriggeredOnStart(bool triggeredOnStart) } /*! - \qmlmethod QtQuick2::Timer::start() + \qmlmethod QtQml2::Timer::start() \brief Starts the timer If the timer is already running, calling this method has no effect. The @@ -245,7 +245,7 @@ void QQmlTimer::start() } /*! - \qmlmethod QtQuick2::Timer::stop() + \qmlmethod QtQml2::Timer::stop() \brief Stops the timer If the timer is not running, calling this method has no effect. The @@ -257,7 +257,7 @@ void QQmlTimer::stop() } /*! - \qmlmethod QtQuick2::Timer::restart() + \qmlmethod QtQml2::Timer::restart() \brief Restarts the timer If the Timer is not running it will be started, otherwise it will be @@ -302,7 +302,7 @@ void QQmlTimer::componentComplete() } /*! - \qmlsignal QtQuick2::Timer::onTriggered() + \qmlsignal QtQml2::Timer::onTriggered() This handler is called when the Timer is triggered. */ |