Fix build with qmake.
This commit is contained in:
parent
9226ebf0a2
commit
40cef9befb
|
@ -57,6 +57,10 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutLineWidth, (QLatin1String(
|
|||
int cachedLineWidth = -1;
|
||||
} // namespace
|
||||
|
||||
#ifndef QBS_BUILD
|
||||
Q_DECLARE_METATYPE(QMarginsF) // NOLINT
|
||||
#endif
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
VPSettings::VPSettings(Format format, Scope scope, const QString &organization, const QString &application,
|
||||
QObject *parent)
|
||||
|
|
|
@ -68,6 +68,10 @@ const qreal VCommonSettings::defaultScrollingAcceleration = 1.3;
|
|||
const qreal VCommonSettings::scrollingAccelerationMin = 1.0;
|
||||
const qreal VCommonSettings::scrollingAccelerationMax = 10.0;
|
||||
|
||||
#ifndef QBS_BUILD
|
||||
Q_DECLARE_METATYPE(QMarginsF) // NOLINT
|
||||
#endif
|
||||
|
||||
namespace
|
||||
{
|
||||
Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsIndividualMeasurements, (QLatin1String("paths/individual_measurements"))) // NOLINT
|
||||
|
|
|
@ -46,6 +46,10 @@
|
|||
#include "../vlayout/vbank.h"
|
||||
#include "qglobal.h"
|
||||
|
||||
#ifndef QBS_BUILD
|
||||
Q_DECLARE_METATYPE(QMarginsF) // NOLINT
|
||||
#endif
|
||||
|
||||
namespace
|
||||
{
|
||||
Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingConfigurationLabelLanguage, // NOLINT
|
||||
|
|
Loading…
Reference in New Issue
Block a user