diff options
Diffstat (limited to 'src/qml/qml')
-rw-r--r-- | src/qml/qml/qqmlcomponent.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlengine.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlerror.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlexpression.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlextensionplugin.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmllist.cpp | 5 | ||||
-rw-r--r-- | src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlparserstatus.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/qqmlproperty.cpp | 2 | ||||
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 4 |
10 files changed, 0 insertions, 25 deletions
diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index 6dc8dd0ce7..a67c5c4a2b 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -174,8 +174,6 @@ V4_DEFINE_EXTENSION(QQmlComponentExtension, componentExtension); } } \endcode - - Note that the \l {Qt Quick 1} version is named QDeclarativeComponent. */ /*! diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp index 5f47376c62..a100e1adc3 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -1031,8 +1031,6 @@ QQuickWorkerScriptEngine *QQmlEnginePrivate::getWorkerScriptEngine() In this case, the Text item will be created in the engine's \l {QQmlEngine::rootContext()}{root context}. - Note that the \l {Qt Quick 1} version is called QDeclarativeEngine. - \sa QQmlComponent, QQmlContext, {QML Global Object} */ diff --git a/src/qml/qml/qqmlerror.cpp b/src/qml/qml/qqmlerror.cpp index fc5b186b29..61e9a3f37e 100644 --- a/src/qml/qml/qqmlerror.cpp +++ b/src/qml/qml/qqmlerror.cpp @@ -73,8 +73,6 @@ QT_BEGIN_NAMESPACE ^ \endcode - Note that the \l {Qt Quick 1} version is named QDeclarativeError - \sa QQuickView::errors(), QQmlComponent::errors() */ class QQmlErrorPrivate diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp index 27d3acb9b7..0c1ffbf3a0 100644 --- a/src/qml/qml/qqmlexpression.cpp +++ b/src/qml/qml/qqmlexpression.cpp @@ -110,8 +110,6 @@ void QQmlExpressionPrivate::init(QQmlContextData *ctxt, QV4::Function *runtimeFu QQmlExpression *expr = new QQmlExpression(engine->rootContext(), myObject, "width * 2"); int result = expr->evaluate().toInt(); // result = 400 \endcode - - Note that the \l {Qt Quick 1} version is called QDeclarativeExpression. */ /*! diff --git a/src/qml/qml/qqmlextensionplugin.cpp b/src/qml/qml/qqmlextensionplugin.cpp index 818ff7c34f..c1c971f0a9 100644 --- a/src/qml/qml/qqmlextensionplugin.cpp +++ b/src/qml/qml/qqmlextensionplugin.cpp @@ -55,8 +55,6 @@ QT_BEGIN_NAMESPACE The \l {Writing QML Extensions with C++} tutorial also contains a chapter on creating QML plugins. - Note that the \l {Qt Quick 1} version is called QDeclarativeExtensionPlugin. - \sa QQmlEngine::importPlugin(), {How to Create Qt Plugins} */ diff --git a/src/qml/qml/qqmllist.cpp b/src/qml/qml/qqmllist.cpp index ac6e3695fe..edc767b2bb 100644 --- a/src/qml/qml/qqmllist.cpp +++ b/src/qml/qml/qqmllist.cpp @@ -109,8 +109,6 @@ Attempting to add objects of the incorrect type to a list property will fail. Like with normal lists, when accessing a list element by index, it is the callers responsibility to ensure that it does not request an out of range element using the count() method before calling at(). - -The \l {Qt Quick 1} version of this class is named QDeclarativeListReference. */ /*! @@ -367,10 +365,7 @@ Q_PROPERTY(QQmlListProperty<Fruit> fruit READ fruit); QML list properties are type-safe - in this case \c {Fruit} is a QObject type that \c {Apple}, \c {Orange} and \c {Banana} all derive from. -The \l {Qt Quick 1} version of this class is named QDeclarativeListProperty. - \sa {Extending QML - Object and List Property Types Example} - */ /*! diff --git a/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp b/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp index 1680253d73..c14a91c1fa 100644 --- a/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp +++ b/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp @@ -80,8 +80,6 @@ QT_BEGIN_NAMESPACE For more information about signals and threads, see \l {Threads and QObjects} and \l {Signals and Slots Across Threads}. - The \l {Qt Quick 1} version of this class is named QDeclarativeNetworkAccessManagerFactory. - \sa {C++ Extensions: Network Access Manager Factory Example}{Network Access Manager Factory Example} */ diff --git a/src/qml/qml/qqmlparserstatus.cpp b/src/qml/qml/qqmlparserstatus.cpp index 1082c318cb..b8f4bb8c19 100644 --- a/src/qml/qml/qqmlparserstatus.cpp +++ b/src/qml/qml/qqmlparserstatus.cpp @@ -81,8 +81,6 @@ QT_BEGIN_NAMESPACE void componentComplete(); } \endcode - - The \l {Qt Quick 1} version of this class is named QDeclarativeParserStatus. */ /*! \internal */ diff --git a/src/qml/qml/qqmlproperty.cpp b/src/qml/qml/qqmlproperty.cpp index bc0124eeab..000b88ebaa 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -111,8 +111,6 @@ qWarning() << "Current pixel size:" << property.read().toInt(); property.write(24); qWarning() << "Pixel size should now be 24:" << property.read().toInt(); \endcode - -The \l {Qt Quick 1} version of this class was named QDeclarativeProperty. */ /*! diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 8feac26cdf..f713efb289 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -1407,10 +1407,6 @@ DEFINE_OBJECT_VTABLE(QQmlBindingFunction); \snippet qml/qtBinding.4.qml 0 - \note In \l {Qt Quick 1}, all function assignments were treated as - binding assignments. The Qt.binding() function is new to - \l {Qt Quick}{Qt Quick 2}. - \since 5.0 */ ReturnedValue QtObject::method_binding(const FunctionObject *b, const Value *, const Value *argv, int argc) |