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

Fixed broken compatible with higher Qt versions.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-11-16 14:07:28 +02:00
parent 8eef5db927
commit 96b2d644e1
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/vmisc/vmargins.h
View File

@ -30,7 +30,6 @@
#define VMARGINS_H #define VMARGINS_H
#include <QtGlobal> #include <QtGlobal>
#include <QMetaType>
#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0) #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
# include "backport/qmarginsf.h" # include "backport/qmarginsf.h"
@ -38,6 +37,4 @@
# include <QMargins> # include <QMargins>
#endif #endif
Q_DECLARE_METATYPE(QMarginsF)
#endif // VMARGINS_H #endif // VMARGINS_H

2
src/libs/vmisc/vsettings.cpp
View File

@ -43,6 +43,8 @@
# include <QtMath> # include <QtMath>
#endif #endif
Q_DECLARE_METATYPE(QMarginsF)
const QString VSettings::SettingConfigurationLabelLanguage = QStringLiteral("configuration/label_language"); const QString VSettings::SettingConfigurationLabelLanguage = QStringLiteral("configuration/label_language");
const QString VSettings::SettingPathsPattern = QStringLiteral("paths/pattern"); const QString VSettings::SettingPathsPattern = QStringLiteral("paths/pattern");