aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build with qmake.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-01-18 17:15:16 +02:00
parent 9226ebf0a2
commit 40cef9befb
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/puzzle/vpsettings.cpp
View File

@ -57,6 +57,10 @@ Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingLayoutLineWidth, (QLatin1String(
int cachedLineWidth = -1; int cachedLineWidth = -1;
} // namespace } // namespace
#ifndef QBS_BUILD
Q_DECLARE_METATYPE(QMarginsF) // NOLINT
#endif
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
VPSettings::VPSettings(Format format, Scope scope, const QString &organization, const QString &application, VPSettings::VPSettings(Format format, Scope scope, const QString &organization, const QString &application,
QObject *parent) QObject *parent)

4
src/libs/vmisc/vcommonsettings.cpp
View File

@ -68,6 +68,10 @@ const qreal VCommonSettings::defaultScrollingAcceleration = 1.3;
const qreal VCommonSettings::scrollingAccelerationMin = 1.0; const qreal VCommonSettings::scrollingAccelerationMin = 1.0;
const qreal VCommonSettings::scrollingAccelerationMax = 10.0; const qreal VCommonSettings::scrollingAccelerationMax = 10.0;
#ifndef QBS_BUILD
Q_DECLARE_METATYPE(QMarginsF) // NOLINT
#endif
namespace namespace
{ {
Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsIndividualMeasurements, (QLatin1String("paths/individual_measurements"))) // NOLINT Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingPathsIndividualMeasurements, (QLatin1String("paths/individual_measurements"))) // NOLINT

4
src/libs/vmisc/vvalentinasettings.cpp
View File

@ -46,6 +46,10 @@
#include "../vlayout/vbank.h" #include "../vlayout/vbank.h"
#include "qglobal.h" #include "qglobal.h"
#ifndef QBS_BUILD
Q_DECLARE_METATYPE(QMarginsF) // NOLINT
#endif
namespace namespace
{ {
Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingConfigurationLabelLanguage, // NOLINT Q_GLOBAL_STATIC_WITH_ARGS(const QString, settingConfigurationLabelLanguage, // NOLINT