diff options
| author | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2021-12-30 10:40:07 +0100 |
|---|---|---|
| committer | Alexey Rusakov <Kitsune-Ral@users.sf.net> | 2022-01-01 20:46:53 +0100 |
| commit | 5b8ea1a0d419fda1729aaa81e34ad20e0dacef44 (patch) | |
| tree | b7e13af6755183e3f0b8d24640a75f336ce72bd7 /lib | |
| parent | 39b50a13a0379ea32be114c85f3c697d75d4e03b (diff) | |
| download | libquotient-5b8ea1a0d419fda1729aaa81e34ad20e0dacef44.tar.gz libquotient-5b8ea1a0d419fda1729aaa81e34ad20e0dacef44.zip | |
Try to fix building with MSVC with Qt pre-5.14
MSVC is quite picky to redeclaration with __declspec(dllexport), judging
it as changing the class of storage. This commit tries to reorder
declarations so that MSVC is made aware of dllexport attribute on the
first encounter rather than the second one.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/quotient_common.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/quotient_common.h b/lib/quotient_common.h index a5926e8c..3d38ce1f 100644 --- a/lib/quotient_common.h +++ b/lib/quotient_common.h @@ -29,13 +29,13 @@ Deprecated Q_DECL_ENUMERATOR_DEPRECATED_X("Use " #Recommended) = Recommended #if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) -// The first line is a usual way to indicate a namespace to moc; -// the second line redeclares the namespace static metaobject with -// QUOTIENT_API so that dynamically linked clients could serialise -// flag/enum values from the namespace. +// 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 \ -Q_NAMESPACE \ -extern QUOTIENT_API const QMetaObject staticMetaObject; + 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) |