aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc/src/cppintegration
diff options
context:
space:
mode:
authorKai Uwe Broulik <kde@privat.broulik.de>2016-05-03 10:40:28 +0200
committerMitch Curtis <mitch.curtis@qt.io>2016-05-03 09:56:45 +0000
commit6bead0e730ebf89a6c83de9bf03fad5f9aa56fe3 (patch)
treef9ea56dfedd9a5b8fa3cd3456b5b2431fa7272bc /src/qml/doc/src/cppintegration
parent373c621bf4dc2ab07bb9c4f19c783fd36debb0dc (diff)
Docs: Prefer Q_ENUM over Q_ENUMS
Change-Id: Ic00e15136b2e4fe977270b081eaf5e765cf5fb7f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'src/qml/doc/src/cppintegration')
-rw-r--r--src/qml/doc/src/cppintegration/data.qdoc6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/doc/src/cppintegration/data.qdoc b/src/qml/doc/src/cppintegration/data.qdoc
index 23f870741b..0d875bd10f 100644
--- a/src/qml/doc/src/cppintegration/data.qdoc
+++ b/src/qml/doc/src/cppintegration/data.qdoc
@@ -112,7 +112,7 @@ when passed from C++ to QML and vice-versa:
\li QVector2D, QVector3D, QVector4D
\li \l vector2d, \l vector3d, \l vector4d
\row
- \li Enums declared with Q_ENUMS()
+ \li Enums declared with Q_ENUM() or Q_ENUMS()
\li \l enumeration
\endtable
@@ -347,7 +347,7 @@ properties:
\section1 Enumeration Types
To use a custom enumeration as a data type, its class must be registered and
-the enumeration must also be declared with Q_ENUMS() to register it with Qt's
+the enumeration must also be declared with Q_ENUM() to register it with Qt's
meta object system. For example, the \c Message class below has a \c Status
enum:
@@ -355,7 +355,6 @@ enum:
class Message : public QObject
{
Q_OBJECT
- Q_ENUMS(Status)
Q_PROPERTY(Status status READ status NOTIFY statusChanged)
public:
enum Status {
@@ -363,6 +362,7 @@ enum:
Loading,
Error
};
+ Q_ENUM(Status)
Status status() const;
signals:
void statusChanged();