Fixed broken compatible with higher Qt versions.
--HG-- branch : develop
This commit is contained in:
parent
8eef5db927
commit
96b2d644e1
|
@ -30,7 +30,6 @@
|
|||
#define VMARGINS_H
|
||||
|
||||
#include <QtGlobal>
|
||||
#include <QMetaType>
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
|
||||
# include "backport/qmarginsf.h"
|
||||
|
@ -38,6 +37,4 @@
|
|||
# include <QMargins>
|
||||
#endif
|
||||
|
||||
Q_DECLARE_METATYPE(QMarginsF)
|
||||
|
||||
#endif // VMARGINS_H
|
||||
|
|
|
@ -43,6 +43,8 @@
|
|||
# include <QtMath>
|
||||
#endif
|
||||
|
||||
Q_DECLARE_METATYPE(QMarginsF)
|
||||
|
||||
const QString VSettings::SettingConfigurationLabelLanguage = QStringLiteral("configuration/label_language");
|
||||
|
||||
const QString VSettings::SettingPathsPattern = QStringLiteral("paths/pattern");
|
||||
|
|
Loading…
Reference in New Issue
Block a user