diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-15 09:39:58 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-03-15 13:12:31 +0000 |
| commit | dc3e3090d21339d78abc706369117b3396c843af (patch) | |
| tree | 6c65e93530ae94b7b0a49716aaaeb01632ba9592 /src/qml/qml | |
| parent | f10ac43ebb839b61315bd3b370b77683b625e4c4 (diff) | |
Fix qdoc errors
Add ',' to enumerator and rearrange Q_QDOC #ifdefs, fixing:
LOG Build & visit PCH for QtQuickDoc
src/quick/scenegraph/coreapi/qsgnode.h:97:49: error: missing ',' between enumerators
src/qml/qml/qqml.h:593:17: error: expected namespace name
Change-Id: I4491c5885c5cdb8a156d9a7abcca5db4d68d1c2e
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qml/qml')
| -rw-r--r-- | src/qml/qml/qqml.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index 05a9f70247..bf9330856d 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -584,7 +584,6 @@ namespace QtQml { const QMetaObject *, bool create); #ifndef Q_QDOC } -#endif QT_WARNING_PUSH QT_WARNING_DISABLE_CLANG("-Wheader-hygiene") @@ -594,6 +593,8 @@ using namespace QtQml; QT_WARNING_POP +#endif // Q_QDOC + //The C++ version of protected namespaces in qmldir Q_QML_EXPORT bool qmlProtectModule(const char* uri, int majVersion); Q_QML_EXPORT void qmlRegisterModule(const char *uri, int versionMajor, int versionMinor); |