Discard vmargins.h. Build backport files if only need.

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2015-12-19 16:38:24 +02:00
parent 1e5def1361
commit 90dac31a2e
5 changed files with 36 additions and 51 deletions

View File

@ -35,7 +35,12 @@
#include "../vlayout/vbank.h" #include "../vlayout/vbank.h"
#include "../ifc/ifcdef.h" #include "../ifc/ifcdef.h"
#include "../vlayout/vlayoutgenerator.h" #include "../vlayout/vlayoutgenerator.h"
#include "../vmisc/vmargins.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
# include "../vmisc/backport/qmarginsf.h"
#else
# include <QMargins>
#endif
namespace Ui namespace Ui
{ {

View File

@ -31,11 +31,16 @@
#include <QObject> #include <QObject>
#include <QList> #include <QList>
#include <memory>
#include "vlayoutdef.h" #include "vlayoutdef.h"
#include "vbank.h" #include "vbank.h"
#include "../vmisc/vmargins.h"
#include <memory> #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
# include "../vmisc/backport/qmarginsf.h"
#else
# include <QMargins>
#endif
class VLayoutPaper; class VLayoutPaper;
class VLayoutDetail; class VLayoutDetail;

View File

@ -1,40 +0,0 @@
/************************************************************************
**
** @file vmargins.h
** @author Roman Telezhynskyi <dismine(at)gmail.com>
** @date 7 11, 2015
**
** @brief
** @copyright
** This source code is part of the Valentine project, a pattern making
** program, whose allow create and modeling patterns of clothing.
** Copyright (C) 2015 Valentina project
** <https://bitbucket.org/dismine/valentina> All Rights Reserved.
**
** Valentina is free software: you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
** the Free Software Foundation, either version 3 of the License, or
** (at your option) any later version.
**
** Valentina is distributed in the hope that it will be useful,
** but WITHOUT ANY WARRANTY; without even the implied warranty of
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
** GNU General Public License for more details.
**
** You should have received a copy of the GNU General Public License
** along with Valentina. If not, see <http://www.gnu.org/licenses/>.
**
*************************************************************************/
#ifndef VMARGINS_H
#define VMARGINS_H
#include <QtGlobal>
#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
# include "backport/qmarginsf.h"
#else
# include <QMargins>
#endif
#endif // VMARGINS_H

View File

@ -4,14 +4,11 @@
SOURCES += \ SOURCES += \
$$PWD/def.cpp \ $$PWD/def.cpp \
$$PWD/undoevent.cpp \ $$PWD/undoevent.cpp \
$$PWD/backport/qcommandlineoption.cpp \
$$PWD/backport/qcommandlineparser.cpp \
$$PWD/vsettings.cpp \ $$PWD/vsettings.cpp \
$$PWD/vabstractapplication.cpp \ $$PWD/vabstractapplication.cpp \
$$PWD/projectversion.cpp \ $$PWD/projectversion.cpp \
$$PWD/vcommonsettings.cpp \ $$PWD/vcommonsettings.cpp \
$$PWD/vtapesettings.cpp \ $$PWD/vtapesettings.cpp \
$$PWD/backport/qmarginsf.cpp \
$$PWD/commandoptions.cpp $$PWD/commandoptions.cpp
win32-msvc*:SOURCES += $$PWD/stable.cpp win32-msvc*:SOURCES += $$PWD/stable.cpp
@ -22,8 +19,6 @@ HEADERS += \
$$PWD/logging.h \ $$PWD/logging.h \
$$PWD/vmath.h \ $$PWD/vmath.h \
$$PWD/undoevent.h \ $$PWD/undoevent.h \
$$PWD/backport/qcommandlineoption.h \
$$PWD/backport/qcommandlineparser.h \
$$PWD/vsettings.h \ $$PWD/vsettings.h \
$$PWD/vabstractapplication.h \ $$PWD/vabstractapplication.h \
$$PWD/projectversion.h \ $$PWD/projectversion.h \
@ -32,6 +27,22 @@ HEADERS += \
$$PWD/debugbreak.h \ $$PWD/debugbreak.h \
$$PWD/vlockguard.h \ $$PWD/vlockguard.h \
$$PWD/vsysexits.h \ $$PWD/vsysexits.h \
$$PWD/backport/qmarginsf.h \
$$PWD/vmargins.h \
$$PWD/commandoptions.h $$PWD/commandoptions.h
contains(QT_VERSION, ^5\\.[0-1]\\.[0-2]$) { # Since Qt 5.2.0
HEADERS += \
$$PWD/backport/qcommandlineoption.h \
$$PWD/backport/qcommandlineparser.h
SOURCES += \
$$PWD/backport/qcommandlineoption.cpp \
$$PWD/backport/qcommandlineparser.cpp
}
contains(QT_VERSION, ^5\\.[0-2]\\.[0-2]$) { # Since Qt 5.3.0
HEADERS += \
$$PWD/backport/qmarginsf.h
SOURCES += \
$$PWD/backport/qmarginsf.cpp
}

View File

@ -32,7 +32,11 @@
#include "vcommonsettings.h" #include "vcommonsettings.h"
#include "../vlayout/vbank.h" #include "../vlayout/vbank.h"
#include "../vmisc/vmargins.h" #if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
# include "../vmisc/backport/qmarginsf.h"
#else
# include <QMargins>
#endif
class VSettings : public VCommonSettings class VSettings : public VCommonSettings
{ {