diff options
-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 | ||||
-rw-r--r-- | src/quick/doc/src/concepts/positioning/righttoleft.qdoc | 4 | ||||
-rw-r--r-- | src/quick/items/qquickpositioners.cpp | 24 | ||||
-rw-r--r-- | src/quick/util/qquickimageprovider.cpp | 2 |
13 files changed, 6 insertions, 49 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) diff --git a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc index 4e1eca7ac3..7c8cd735b3 100644 --- a/src/quick/doc/src/concepts/positioning/righttoleft.qdoc +++ b/src/quick/doc/src/concepts/positioning/righttoleft.qdoc @@ -73,7 +73,7 @@ the effective alignment of the text element that takes the mirroring into accoun (This applies to the \l Row, \l Grid, \l Flow, \l ListView and \l GridView types.) -From Qt Quick 1.1 onwards, types used for horizontal positioning and model views have gained a \c layoutDirection +Types used for horizontal positioning and model views have the \c layoutDirection property for controlling the horizontal direction of the layouts. Setting \c layoutDirection to \c Qt.RightToLeft causes items to be laid out from the right to left. By default Qt Quick follows the left-to-right layout direction. @@ -132,7 +132,7 @@ aligned and just make sure that text is translated and aligned properly. (This applies to \l Image, \l BorderImage and \l AnimatedImage types.) Most images do not need to be mirrored, but some directional icons, such as arrows, may need to be mirrored. -The painting of these icons can be mirrored with a dedicated \c mirror property introduced in Qt Quick 1.1: +The painting of these icons can be mirrored with a dedicated \c mirror property: \snippet qml/righttoleft.qml 5 diff --git a/src/quick/items/qquickpositioners.cpp b/src/quick/items/qquickpositioners.cpp index 55bafd9f83..512f59d799 100644 --- a/src/quick/items/qquickpositioners.cpp +++ b/src/quick/items/qquickpositioners.cpp @@ -900,11 +900,7 @@ void QQuickPositionerAttached::setIsLastItem(bool isLastItem) cases, these lists will be empty. See the \l ViewTransition documentation for more details and examples on using these transitions. - \note In \l {Qt Quick 1}, this transition was applied to all items that were part of the - positioner at the time of its creation. From \l {Qt Quick}{Qt Quick 2} onwards, positioners apply the - \l populate transition to these items instead. - - \sa add, ViewTransition, {Qt Quick Examples - Positioners} + \sa add, populate, ViewTransition, {Qt Quick Examples - Positioners} */ /*! \qmlproperty real QtQuick::Column::spacing @@ -1089,11 +1085,7 @@ void QQuickColumn::reportConflictingAnchors() cases, these lists will be empty. See the \l ViewTransition documentation for more details and examples on using these transitions. - \note In \l {Qt Quick 1}, this transition was applied to all items that were part of the - positioner at the time of its creation. From \l {Qt Quick}{QtQuick 2} onwards, positioners apply the - \l populate transition to these items instead. - - \sa add, ViewTransition, {Qt Quick Examples - Positioners} + \sa add, populate, ViewTransition, {Qt Quick Examples - Positioners} */ /*! \qmlproperty real QtQuick::Row::spacing @@ -1378,11 +1370,7 @@ void QQuickRow::reportConflictingAnchors() cases, these lists will be empty. See the \l ViewTransition documentation for more details and examples on using these transitions. - \note In \l {Qt Quick 1}, this transition was applied to all items that were part of the - positioner at the time of its creation. From \l {Qt Quick}{QtQuick 2} onwards, positioners apply the - \l populate transition to these items instead. - - \sa add, ViewTransition, {Qt Quick Examples - Positioners} + \sa add, populate, ViewTransition, {Qt Quick Examples - Positioners} */ /*! \qmlproperty qreal QtQuick::Grid::spacing @@ -1974,11 +1962,7 @@ void QQuickGrid::reportConflictingAnchors() cases, these lists will be empty. See the \l ViewTransition documentation for more details and examples on using these transitions. - \note In \l {Qt Quick 1}, this transition was applied to all items that were part of the - positioner at the time of its creation. From \l {Qt Quick}{QtQuick 2} onwards, positioners apply the - \l populate transition to these items instead. - - \sa add, ViewTransition, {Qt Quick Examples - Positioners} + \sa add, populate, ViewTransition, {Qt Quick Examples - Positioners} */ /*! \qmlproperty real QtQuick::Flow::spacing diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp index 5d7664433b..ced981de3e 100644 --- a/src/quick/util/qquickimageprovider.cpp +++ b/src/quick/util/qquickimageprovider.cpp @@ -334,8 +334,6 @@ void QQuickImageResponse::cancel() \c cache property to \c false for the relevant \l Image, \l BorderImage or \l AnimatedImage object. - The \l {Qt Quick 1} version of this class is named QDeclarativeImageProvider. - \sa QQmlEngine::addImageProvider() */ |