From 96b2d644e1f8fa8c163b54916a7785cef95b0089 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Mon, 16 Nov 2015 14:07:28 +0200 Subject: [PATCH] Fixed broken compatible with higher Qt versions. --HG-- branch : develop --- src/libs/vmisc/vmargins.h | 3 --- src/libs/vmisc/vsettings.cpp | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/libs/vmisc/vmargins.h b/src/libs/vmisc/vmargins.h index 056d4d7ee..5f3a339f6 100644 --- a/src/libs/vmisc/vmargins.h +++ b/src/libs/vmisc/vmargins.h @@ -30,7 +30,6 @@ #define VMARGINS_H #include -#include #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) # include "backport/qmarginsf.h" @@ -38,6 +37,4 @@ # include #endif -Q_DECLARE_METATYPE(QMarginsF) - #endif // VMARGINS_H diff --git a/src/libs/vmisc/vsettings.cpp b/src/libs/vmisc/vsettings.cpp index 5be25d3fe..e115e05d6 100644 --- a/src/libs/vmisc/vsettings.cpp +++ b/src/libs/vmisc/vsettings.cpp @@ -43,6 +43,8 @@ # include #endif +Q_DECLARE_METATYPE(QMarginsF) + const QString VSettings::SettingConfigurationLabelLanguage = QStringLiteral("configuration/label_language"); const QString VSettings::SettingPathsPattern = QStringLiteral("paths/pattern");