diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2013-04-20 01:14:53 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-24 14:18:03 +0200 |
commit | b1a321a1d7762e8c20e244164bd42822c3bd0310 (patch) | |
tree | 1da6ac38e696f099074683fb5858c999126c5884 /src/qml | |
parent | 159ccaa57f6f653c36af47910b98e106be5112bc (diff) |
Doc: Create links to Qt Quick 1
Point to the porting guide, so that users who search for the old names
will be directed to an explanation of the name change.
Also made some new links to Qt Quick 2, and changed "favour" -> "favor"
(Sanity Bot complained)
Change-Id: If30c8d619d8fdb9df72b7b5f3efd356f1e07b23a
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/qml')
-rw-r--r-- | src/qml/doc/src/whatsnew.qdoc | 2 | ||||
-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 | 4 | ||||
-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 |
11 files changed, 13 insertions, 13 deletions
diff --git a/src/qml/doc/src/whatsnew.qdoc b/src/qml/doc/src/whatsnew.qdoc index e561ec5215..3ede4803ec 100644 --- a/src/qml/doc/src/whatsnew.qdoc +++ b/src/qml/doc/src/whatsnew.qdoc @@ -34,7 +34,7 @@ The \l{Qt QML} module is new in Qt 5.0. It provides the QML engine and implements the QML language supporting infrastructure. -(Prior to Qt 5, this functionality was provided by the \c QtDeclarative module, which +(Prior to Qt 5, this functionality was provided by the \l {Qt Quick 1}{QtDeclarative} module, which has now been replaced by the new \l {Qt QML} and \l {Qt Quick} C++ modules. See the \l {Porting QML Applications to Qt 5} for more information.) diff --git a/src/qml/qml/qqmlcomponent.cpp b/src/qml/qml/qqmlcomponent.cpp index aadcbd0cd3..7cf7c5475e 100644 --- a/src/qml/qml/qqmlcomponent.cpp +++ b/src/qml/qml/qqmlcomponent.cpp @@ -186,7 +186,7 @@ static inline QString buildTypeNameForDebug(const QMetaObject *metaObject) } \endcode - Note that the Qt Quick 1 version is named QDeclarativeComponent. + 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 5dda7ea430..5fa5cfd9ef 100644 --- a/src/qml/qml/qqmlengine.cpp +++ b/src/qml/qml/qqmlengine.cpp @@ -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 Qt Quick 1 version is called QDeclarativeEngine. + Note that the \l {Qt Quick 1} version is called QDeclarativeEngine. \sa QQmlComponent, QQmlContext */ diff --git a/src/qml/qml/qqmlerror.cpp b/src/qml/qml/qqmlerror.cpp index 96e867d916..98d8259dda 100644 --- a/src/qml/qml/qqmlerror.cpp +++ b/src/qml/qml/qqmlerror.cpp @@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE ^ \endcode - Note that the Qt Quick 1 version is named QDeclarativeError + Note that the \l {Qt Quick 1} version is named QDeclarativeError \sa QQuickView::errors(), QQmlComponent::errors() */ diff --git a/src/qml/qml/qqmlexpression.cpp b/src/qml/qml/qqmlexpression.cpp index c35a495025..accc645f1e 100644 --- a/src/qml/qml/qqmlexpression.cpp +++ b/src/qml/qml/qqmlexpression.cpp @@ -162,7 +162,7 @@ QQmlExpressionPrivate::create(QQmlContextData *ctxt, QObject *object, int result = expr->evaluate().toInt(); // result = 400 \endcode - Note that the Qt Quick 1 version is called QDeclarativeExpression. + 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 827b9da159..babdd6ea71 100644 --- a/src/qml/qml/qqmlextensionplugin.cpp +++ b/src/qml/qml/qqmlextensionplugin.cpp @@ -121,7 +121,7 @@ QT_BEGIN_NAMESPACE The \l {Writing QML Extensions with C++} tutorial also contains a chapter on creating QML plugins. - Note that the Qt Quick 1 version is called QDeclarativeExtensionPlugin. + 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 57f9577446..91c9bc2416 100644 --- a/src/qml/qml/qqmllist.cpp +++ b/src/qml/qml/qqmllist.cpp @@ -112,7 +112,7 @@ 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 Qt Quick 1 version of this class is named QDeclarativeListReference. +The \l {Qt Quick 1} version of this class is named QDeclarativeListReference. */ /*! @@ -369,7 +369,7 @@ Q_PROPERTY(QQmlListProperty<Fruit> fruit READ fruit); QML list properties are typesafe - in this case \c {Fruit} is a QObject type that \c {Apple}, \c {Orange} and \c {Banana} all derive from. -The Qt Quick 1 version of this class is named QDeclarativeListProperty. +The \l {Qt Quick 1} version of this class is named QDeclarativeListProperty. \note QQmlListProperty can only be used for lists of QObject-derived object pointers. */ diff --git a/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp b/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp index 02b22bef0c..b0271b11f2 100644 --- a/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp +++ b/src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp @@ -80,7 +80,7 @@ QT_BEGIN_NAMESPACE For more information about signals and threads, see \l {Threads and QObjects} and \l {Signals and Slots Across Threads}. - The Qt Quick 1 version of this class is named QDeclarativeNetworkAccessManagerFactory. + The \l {Qt Quick 1} version of this class is named QDeclarativeNetworkAccessManagerFactory. \sa {qml/networkaccessmanagerfactory}{NetworkAccessManagerFactory example} */ diff --git a/src/qml/qml/qqmlparserstatus.cpp b/src/qml/qml/qqmlparserstatus.cpp index 4f4f2b760c..41b7d962ce 100644 --- a/src/qml/qml/qqmlparserstatus.cpp +++ b/src/qml/qml/qqmlparserstatus.cpp @@ -84,7 +84,7 @@ QT_BEGIN_NAMESPACE } \endcode - The Qt Quick 1 version of this class is named QDeclarativeParserStatus. + 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 ee06d3b1d5..0baf450cbf 100644 --- a/src/qml/qml/qqmlproperty.cpp +++ b/src/qml/qml/qqmlproperty.cpp @@ -112,7 +112,7 @@ property.write(24); qWarning() << "Pixel size should now be 24:" << property.read().toInt(); \endcode -The Qt Quick 1 version of this class was named QDeclarativeProperty. +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 1be2a0b578..b5f4bf555c 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -1634,9 +1634,9 @@ v8::Handle<v8::Value> locale(const v8::Arguments &args) \snippet qml/qtBinding.4.qml 0 - Note: in \c {QtQuick 1.x}, all function assignment was treated as + \note In \l {Qt Quick 1}, all function assignment was treated as binding assignment, so the Qt.binding() function is new in - \c {QtQuick 2.0}. + \l {Qt Quick}{Qt Quick 2}. \since QtQuick 2.0 */ |