Try to avoid redeclaration.
This commit is contained in:
parent
2691f0b9e4
commit
fb08b0a317
|
@ -58,7 +58,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutLineWidth, (QLatin1String(
|
|||
int cachedLineWidth = -1;
|
||||
} // namespace
|
||||
|
||||
#ifndef QBS_BUILD
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
|
||||
Q_DECLARE_METATYPE(QMarginsF) // NOLINT
|
||||
#endif
|
||||
|
||||
|
|
|
@ -71,7 +71,7 @@ const qreal VCommonSettings::defaultScrollingAcceleration = 1.3;
|
|||
const qreal VCommonSettings::scrollingAccelerationMin = 1.0;
|
||||
const qreal VCommonSettings::scrollingAccelerationMax = 10.0;
|
||||
|
||||
#ifndef QBS_BUILD
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
|
||||
Q_DECLARE_METATYPE(QMarginsF) // NOLINT
|
||||
#endif
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
#include "../vmisc/compatibility.h"
|
||||
#include "qglobal.h"
|
||||
|
||||
#ifndef QBS_BUILD
|
||||
#if (QT_VERSION < QT_VERSION_CHECK(5, 15, 0))
|
||||
Q_DECLARE_METATYPE(QMarginsF) // NOLINT
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user