diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-26 10:57:14 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-26 15:12:31 +0100 |
| commit | 141d718ce281f092c146e2d41ea51542ff7fe093 (patch) | |
| tree | 35f5386eedd3122176e7726fe94b541d498ecf78 /src/corelib/kernel/qmetatype.h | |
| parent | c8c8e1990ce74590739bd52874e38e03e3d64825 (diff) | |
Move isBuiltinType() to namespace QtPrivate and export it.
There is currently a symbol clash with a duplicated
isBuiltinType() in ActiveQt's dumpcpp-tool, which breaks static
building. Reuse the function.
Task-number: QTBUG-28131
Change-Id: I4985e8405924754aa613311ca3f06d6ba29758b8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 45cb6db853..06d325f383 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -509,7 +509,9 @@ namespace QtPrivate { enum { Value = true }; }; -} + + Q_CORE_EXPORT bool isBuiltinType(const QByteArray &type); +} // namespace QtPrivate template <typename T, bool = QtPrivate::IsPointerToTypeDerivedFromQObject<T>::Value> struct QMetaTypeIdQObject |