diff options
| author | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-16 19:56:04 +0000 |
|---|---|---|
| committer | Qt CI Bot <qt_ci_bot@qt-project.org> | 2021-04-16 19:56:04 +0000 |
| commit | 09d99a8d5f4a0e359862b9b9463d7260ff33cea1 (patch) | |
| tree | a5d2e61b2123586493a3571bb1374f5e2740804c /src/corelib | |
| parent | 5839dee30fcbc3a4f3cdd4ace40ef8b2d5d96158 (diff) | |
| parent | b9d0fd3a09c23b410bb8ef228ff5326d118f3069 (diff) | |
Merge integration refs/builds/qtci/dev/1618592683
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index c08a87efd9..1d039b6f18 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -444,7 +444,7 @@ public: bool isValid() const; bool isRegistered() const; -#if defined(QT_QMETATYPE_BC_COMPAT) +#if defined(QT_QMETATYPE_BC_COMPAT) || defined(Q_QDOC) int id() const; #else // ### Qt 7: Remove traces of out of line version |