Use enumeration in preference to enum when referring to QML API.

Task-number: QTBUG-24666
Change-Id: I5197d4b4d1a1b53cae2033bd86ce26ba55d08384
Reviewed-by: Bea Lam <bea.lam@nokia.com>

diff --git a/src/qml/qml/qqmlcustomparser.cpp b/src/qml/qml/qqmlcustomparser.cpp
index 7c7a2f5..c8457ed 100644 (file)
--- a/src/qml/qml/qqmlcustomparser.cpp
+++ b/src/qml/qml/qqmlcustomparser.cpp
@@ -279,7 +279,7 @@ void QQmlCustomParser::error(const QQmlCustomParserNode& node, const QString& de
 }
 
 /*!
-    If \a script is a simple enum expression (eg. Text.AlignLeft),
+    If \a script is a simple enumeration expression (eg. Text.AlignLeft),
     returns the integer equivalent (eg. 1), and sets \a ok to true.
 
     Otherwise sets \a ok to false.

diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 391b8e8..229a071 100644 (file)
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -267,7 +267,7 @@ Text {
 \section1 Enums
 
 The Qt object contains the enums available in the \l {Qt Namespace}. For example, you can access
-the \l Qt::LeftButton and \l Qt::RightButton enum values as \c Qt.LeftButton and \c Qt.RightButton.
+the \l Qt::LeftButton and \l Qt::RightButton enumeration values as \c Qt.LeftButton and \c Qt.RightButton.
 
 
 \section1 Types

diff --git a/src/quick/doc/src/whatsnew.qdoc b/src/quick/doc/src/whatsnew.qdoc
index 8de2f7a..19e1033 100644 (file)
--- a/src/quick/doc/src/whatsnew.qdoc
+++ b/src/quick/doc/src/whatsnew.qdoc
@@ -106,8 +106,8 @@ Below are the additions and changes in QtQuick 2.0.
     \list
     \li New \l{Image::}{horizontalAlignment} and \l{Image::}{verticalAlignment} properties to set
         the image alignment.
-    \li New \c Image.Pad enum value for \l{Image::}{fillMode} that does not transform the image,
-        unlike other \l{Image::}{fillMode} enum values.
+    \li New \c Image.Pad enumeration value for \l{Image::}{fillMode} that does not transform the image,
+        unlike other \l{Image::}{fillMode} enumeration values.
     \li Modifying the \l{Image::}{sourceSize} now fits the image to the size, maintaining aspect
         ratio.
     \endlist
@@ -291,7 +291,7 @@ the window loses focus.
     \li New transition support for animating the adding, removing and moving of items in a ListView
         or GridView. See the ViewTransition documentation for details.
     \li New \c verticalLayoutDirection property enables items to be laid out from bottom-to-top
-        using the new \c BottomToTop enum value.
+        using the new \c BottomToTop enumeration value.
     \li New \c headerItem and \c footerItem properties provide access to the instantiated header and
         footer items.
     \li The \c cacheBuffer property now has a non-zero default.

diff --git a/src/quick/items/qquickdrag.cpp b/src/quick/items/qquickdrag.cpp
index 80dbf2b..065a97e 100644 (file)
--- a/src/quick/items/qquickdrag.cpp
+++ b/src/quick/items/qquickdrag.cpp
@@ -527,7 +527,7 @@ void QQuickDragAttached::start(QQmlV8Function *args)
 }
 
 /*!
-    \qmlattachedmethod enum QtQuick2::Drag::drop()
+    \qmlattachedmethod enumeration QtQuick2::Drag::drop()
 
     Ends a drag sequence by sending a drop event to the target item.
 

diff --git a/src/quick/items/qquickdroparea.cpp b/src/quick/items/qquickdroparea.cpp
index 1f5d98c..ee89098 100644 (file)
--- a/src/quick/items/qquickdroparea.cpp
+++ b/src/quick/items/qquickdroparea.cpp
@@ -376,7 +376,7 @@ QStringList QQuickDropEvent::keys() const
 }
 
 /*!
-    \qmlproperty enum QtQuick2::DragEvent::action
+    \qmlproperty enumeration QtQuick2::DragEvent::action
 
     This property holds the action that the \l source is to perform on an accepted drop.
 
@@ -407,7 +407,7 @@ QStringList QQuickDropEvent::keys() const
 
 /*!
     \qmlmethod void QtQuick2::DragEvent::accept()
-    \qmlmethod void QtQuick2::DragEvent::accept(enum action)
+    \qmlmethod void QtQuick2::DragEvent::accept(enumeration action)
 
     Accepts the drag event.
 

diff --git a/src/quick/items/qquicktextedit.cpp b/src/quick/items/qquicktextedit.cpp
index 81aabd2..d09c432 100644 (file)
--- a/src/quick/items/qquicktextedit.cpp
+++ b/src/quick/items/qquicktextedit.cpp
@@ -1201,7 +1201,7 @@ void QQuickTextEdit::setSelectByMouse(bool on)
 }
 
 /*!
-    \qmlproperty enum QtQuick2::TextEdit::mouseSelectionMode
+    \qmlproperty enumeration QtQuick2::TextEdit::mouseSelectionMode
 
     Specifies how text should be selected using a mouse.
 

diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index ce2492d..af7349e 100644 (file)
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -2170,7 +2170,7 @@ void QQuickTextInput::setSelectByMouse(bool on)
 }
 
 /*!
-    \qmlproperty enum QtQuick2::TextInput::mouseSelectionMode
+    \qmlproperty enumeration QtQuick2::TextInput::mouseSelectionMode
 
     Specifies how text should be selected using a mouse.
 

diff --git a/src/quick/util/qquickpath.cpp b/src/quick/util/qquickpath.cpp
index ff220c6..2594d33 100644 (file)
--- a/src/quick/util/qquickpath.cpp
+++ b/src/quick/util/qquickpath.cpp
@@ -1618,7 +1618,7 @@ void QQuickPathArc::setUseLargeArc(bool largeArc)
 }
 
 /*!
-    \qmlproperty enum QtQuick2::PathArc::direction
+    \qmlproperty enumeration QtQuick2::PathArc::direction
 
     Defines the direction of the arc. Possible values are
     PathArc.Clockwise (default) and PathArc.Counterclockwise.