diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-06-18 21:26:43 +0200 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-06-18 21:26:43 +0200 |
| commit | 6b355d1aa87072143e09ea5269e8cf465318a64f (patch) | |
| tree | 5de8b227d319e8c677ef4ea3d7931233a808bd5a /lib/quotient_common.h | |
| parent | 2dd85770cbfd6d9c7506757f25765c05ef74987d (diff) | |
| download | libquotient-6b355d1aa87072143e09ea5269e8cf465318a64f.tar.gz libquotient-6b355d1aa87072143e09ea5269e8cf465318a64f.zip | |
Drop pre-Qt 5.15 code
Diffstat (limited to 'lib/quotient_common.h')
| -rw-r--r-- | lib/quotient_common.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/lib/quotient_common.h b/lib/quotient_common.h index 2b785a39..8bcd5ca6 100644 --- a/lib/quotient_common.h +++ b/lib/quotient_common.h @@ -51,21 +51,8 @@ #define DECL_DEPRECATED_ENUMERATOR(Deprecated, Recommended) \ Deprecated Q_DECL_ENUMERATOR_DEPRECATED_X("Use " #Recommended) = Recommended -#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) -// The first line forward-declares the namespace static metaobject with -// QUOTIENT_API so that dynamically linked clients could serialise flag/enum -// values from the namespace; Qt before 5.14 doesn't help with that. The second -// line is needed for moc to do its job on the namespace. -#define QUO_NAMESPACE \ - extern QUOTIENT_API const QMetaObject staticMetaObject; \ - Q_NAMESPACE -#else -// Since Qt 5.14.0, it's all packed in a single macro -#define QUO_NAMESPACE Q_NAMESPACE_EXPORT(QUOTIENT_API) -#endif - namespace Quotient { -QUO_NAMESPACE +Q_NAMESPACE_EXPORT(QUOTIENT_API) // std::array {} needs explicit template parameters on macOS because // Apple stdlib doesn't have deduction guides for std::array. C++20 has |