Fix for build on drone.io.
--HG-- branch : develop
This commit is contained in:
parent
64e07c405a
commit
026804bc37
|
@ -53,7 +53,7 @@
|
|||
Q_LOGGING_CATEGORY(mApp, "m.application")
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
|
||||
# include "../../libs/vmisc/backport/qcommandlineparser.h"
|
||||
# include "../vmisc/backport/qcommandlineparser.h"
|
||||
#else
|
||||
# include <QCommandLineParser>
|
||||
#endif
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#ifndef VERSION_H
|
||||
#define VERSION_H
|
||||
|
||||
#include "../../libs/vmisc/projectversion.h"
|
||||
#include "../vmisc/projectversion.h"
|
||||
|
||||
#define VER_INTERNALNAME_STR "Tape"
|
||||
#define VER_ORIGINALFILENAME_STR "tape.exe"
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
#include "../vmisc/vsysexits.h"
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
|
||||
# include "../libs/vmisc/backport/qcommandlineparser.h"
|
||||
# include "../vmisc/backport/qcommandlineparser.h"
|
||||
#else
|
||||
# include <QCommandLineParser>
|
||||
#endif
|
||||
|
|
|
@ -29,10 +29,10 @@
|
|||
#include "vformulaproperty.h"
|
||||
#include "vformulapropertyeditor.h"
|
||||
|
||||
#include "../../libs/vpropertyexplorer/vproperty_p.h"
|
||||
#include "../vpropertyexplorer/vproperty_p.h"
|
||||
#include "vformulapropertyeditor.h"
|
||||
#include "../../libs/vpropertyexplorer/vproperties.h"
|
||||
#include "../../libs/vpatterndb/vformula.h"
|
||||
#include "../vpropertyexplorer/vproperties.h"
|
||||
#include "../vpatterndb/vformula.h"
|
||||
|
||||
enum class ChildType : char {Invalid = 0, Value = 1, Formula = 2};
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#ifndef VFORMULAPROPERTY_H
|
||||
#define VFORMULAPROPERTY_H
|
||||
|
||||
#include "../../libs/vpropertyexplorer/vproperty.h"
|
||||
#include "../vpropertyexplorer/vproperty.h"
|
||||
|
||||
class VFormula;
|
||||
|
||||
|
|
|
@ -34,8 +34,8 @@
|
|||
#include <QApplication>
|
||||
#include <QColorDialog>
|
||||
|
||||
#include "../../libs/vpropertyexplorer/vproperty.h"
|
||||
#include "../../libs/vtools/dialogs/support/dialogeditwrongformula.h"
|
||||
#include "../vpropertyexplorer/vproperty.h"
|
||||
#include "../vtools/dialogs/support/dialogeditwrongformula.h"
|
||||
|
||||
using namespace VPE;
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include <QLabel>
|
||||
#include <QSpacerItem>
|
||||
|
||||
#include "../../libs/vpatterndb/vformula.h"
|
||||
#include "../vpatterndb/vformula.h"
|
||||
|
||||
class VFormulaPropertyEditor : public QWidget
|
||||
{
|
||||
|
|
|
@ -27,15 +27,15 @@
|
|||
*************************************************************************/
|
||||
|
||||
#include "vtooloptionspropertybrowser.h"
|
||||
#include "../../libs/vtools/tools/drawTools/drawtools.h"
|
||||
#include "../vtools/tools/drawTools/drawtools.h"
|
||||
#include "../core/vapplication.h"
|
||||
#include "../../libs/vwidgets/vmaingraphicsview.h"
|
||||
#include "../../libs/vwidgets/vgraphicssimpletextitem.h"
|
||||
#include "../../libs/vwidgets/vcontrolpointspline.h"
|
||||
#include "../../libs/vwidgets/vsimplepoint.h"
|
||||
#include "../../libs/vpropertyexplorer/vproperties.h"
|
||||
#include "../vwidgets/vmaingraphicsview.h"
|
||||
#include "../vwidgets/vgraphicssimpletextitem.h"
|
||||
#include "../vwidgets/vcontrolpointspline.h"
|
||||
#include "../vwidgets/vsimplepoint.h"
|
||||
#include "../vpropertyexplorer/vproperties.h"
|
||||
#include "vformulaproperty.h"
|
||||
#include "../../libs/vpatterndb/vformula.h"
|
||||
#include "../vpatterndb/vformula.h"
|
||||
|
||||
#include <QDockWidget>
|
||||
#include <QHBoxLayout>
|
||||
|
|
|
@ -32,9 +32,9 @@
|
|||
#include <QObject>
|
||||
#include <QMap>
|
||||
|
||||
#include "../../libs/vpropertyexplorer/vproperty.h"
|
||||
#include "../../libs/vpropertyexplorer/vpropertymodel.h"
|
||||
#include "../../libs/vpropertyexplorer/vpropertyformview.h"
|
||||
#include "../vpropertyexplorer/vproperty.h"
|
||||
#include "../vpropertyexplorer/vpropertymodel.h"
|
||||
#include "../vpropertyexplorer/vpropertyformview.h"
|
||||
|
||||
class QDockWidget;
|
||||
class QGraphicsItem;
|
||||
|
|
|
@ -28,13 +28,13 @@
|
|||
|
||||
#include "dialoghistory.h"
|
||||
#include "ui_dialoghistory.h"
|
||||
#include "../../libs/vgeometry/varc.h"
|
||||
#include "../../libs/vgeometry/vsplinepath.h"
|
||||
#include "../../libs/vgeometry/vpointf.h"
|
||||
#include "../../libs/vtools/tools/vabstracttool.h"
|
||||
#include "../../libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h"
|
||||
#include "../../libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h"
|
||||
#include "../../libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h"
|
||||
#include "../vgeometry/varc.h"
|
||||
#include "../vgeometry/vsplinepath.h"
|
||||
#include "../vgeometry/vpointf.h"
|
||||
#include "../vtools/tools/vabstracttool.h"
|
||||
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutspline.h"
|
||||
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutsplinepath.h"
|
||||
#include "../vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcutarc.h"
|
||||
#include "../xml/vpattern.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#ifndef DIALOGHISTORY_H
|
||||
#define DIALOGHISTORY_H
|
||||
|
||||
#include "../../libs/vtools/dialogs/tools/dialogtool.h"
|
||||
#include "../vtools/dialogs/tools/dialogtool.h"
|
||||
|
||||
#include <QDomElement>
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
#include <QDialog>
|
||||
|
||||
#include "../../libs/vlayout/vlayoutdef.h"
|
||||
#include "../vlayout/vlayoutdef.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
#include "dialoglayoutsettings.h"
|
||||
#include "ui_dialoglayoutsettings.h"
|
||||
#include "../core/vapplication.h"
|
||||
#include "../../libs/ifc/xml/vdomdocument.h"
|
||||
#include "../../libs/vmisc/vsettings.h"
|
||||
#include "../ifc/xml/vdomdocument.h"
|
||||
#include "../vmisc/vsettings.h"
|
||||
#include <vector>
|
||||
|
||||
#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0)
|
||||
|
|
|
@ -32,9 +32,9 @@
|
|||
#include <QCloseEvent>
|
||||
#include <QDialog>
|
||||
|
||||
#include "../../libs/vlayout/vbank.h"
|
||||
#include "../../libs/ifc/ifcdef.h"
|
||||
#include "../../libs/vlayout/vlayoutgenerator.h"
|
||||
#include "../vlayout/vbank.h"
|
||||
#include "../ifc/ifcdef.h"
|
||||
#include "../vlayout/vlayoutgenerator.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
|
|
@ -29,9 +29,9 @@
|
|||
#include "dialognewpattern.h"
|
||||
#include "ui_dialognewpattern.h"
|
||||
#include "../core/vapplication.h"
|
||||
#include "../../libs/vmisc/vsettings.h"
|
||||
#include "../../libs/vpatterndb/vcontainer.h"
|
||||
#include "../../libs/ifc/xml/vdomdocument.h"
|
||||
#include "../vmisc/vsettings.h"
|
||||
#include "../vpatterndb/vcontainer.h"
|
||||
#include "../ifc/xml/vdomdocument.h"
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QMessageBox>
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#include "ui_dialogsavelayout.h"
|
||||
#include "../options.h"
|
||||
#include "../core/vapplication.h"
|
||||
#include "../../libs/vmisc/vsettings.h"
|
||||
#include "../vmisc/vsettings.h"
|
||||
|
||||
#include <QDir>
|
||||
#include <QFileDialog>
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include "../vlayout/vlayoutdetail.h"
|
||||
#include "xml/vpattern.h"
|
||||
#include "dialogs/dialogsavelayout.h"
|
||||
#include "../../libs/vlayout/vlayoutgenerator.h"
|
||||
#include "../vlayout/vlayoutgenerator.h"
|
||||
|
||||
|
||||
class QGraphicsScene;
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#ifndef VERSION_H
|
||||
#define VERSION_H
|
||||
|
||||
#include "../../libs/vmisc/projectversion.h"
|
||||
#include "../vmisc/projectversion.h"
|
||||
|
||||
#define VER_INTERNALNAME_STR "Valentina"
|
||||
#define VER_ORIGINALFILENAME_STR "valentina.exe"
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#define VCOMMONSETTINGS_H
|
||||
|
||||
#include <QSettings>
|
||||
#include "../../libs/vlayout/vbank.h"
|
||||
#include "../vlayout/vbank.h"
|
||||
|
||||
class VCommonSettings : public QSettings
|
||||
{
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#define VSETTINGS_H
|
||||
|
||||
#include "vcommonsettings.h"
|
||||
#include "../../libs/vlayout/vbank.h"
|
||||
#include "../vlayout/vbank.h"
|
||||
|
||||
class VSettings : public VCommonSettings
|
||||
{
|
||||
|
|
|
@ -31,7 +31,7 @@
|
|||
|
||||
#include "ui_dialogdetail.h"
|
||||
#include "dialogtool.h"
|
||||
#include "../../libs/vpatterndb/vdetail.h"
|
||||
#include "../vpatterndb/vdetail.h"
|
||||
|
||||
/**
|
||||
* @brief The DialogDetail class dialog for ToolDetai. Help create detail and edit option.
|
||||
|
|
|
@ -29,11 +29,11 @@
|
|||
#include "dialogheight.h"
|
||||
#include "ui_dialogheight.h"
|
||||
|
||||
#include "../../libs/vgeometry/vpointf.h"
|
||||
#include "../../libs/vpatterndb/vcontainer.h"
|
||||
#include "../vgeometry/vpointf.h"
|
||||
#include "../vpatterndb/vcontainer.h"
|
||||
#include "../../tools/vabstracttool.h"
|
||||
#include "../../visualization/vistoolheight.h"
|
||||
#include "../../libs/vwidgets/vmaingraphicsscene.h"
|
||||
#include "../vwidgets/vmaingraphicsscene.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
|
|
|
@ -29,10 +29,10 @@
|
|||
#include "dialoglineintersect.h"
|
||||
#include "ui_dialoglineintersect.h"
|
||||
|
||||
#include "../../libs/vgeometry/vpointf.h"
|
||||
#include "../../libs/vpatterndb/vcontainer.h"
|
||||
#include "../vgeometry/vpointf.h"
|
||||
#include "../vpatterndb/vcontainer.h"
|
||||
#include "../../visualization/vistoollineintersect.h"
|
||||
#include "../../libs/vwidgets/vmaingraphicsscene.h"
|
||||
#include "../vwidgets/vmaingraphicsscene.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
|
|
|
@ -29,10 +29,10 @@
|
|||
#include "dialogpointfromarcandtangent.h"
|
||||
#include "ui_dialogpointfromarcandtangent.h"
|
||||
|
||||
#include "../../libs/vgeometry/vpointf.h"
|
||||
#include "../../libs/vpatterndb/vcontainer.h"
|
||||
#include "../vgeometry/vpointf.h"
|
||||
#include "../vpatterndb/vcontainer.h"
|
||||
#include "../../visualization/vistoolpointfromarcandtangent.h"
|
||||
#include "../../libs/vwidgets/vmaingraphicsscene.h"
|
||||
#include "../vwidgets/vmaingraphicsscene.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *data, const quint32 &toolId,
|
||||
|
|
|
@ -29,10 +29,10 @@
|
|||
#include "dialogpointofintersectionarcs.h"
|
||||
#include "ui_dialogpointofintersectionarcs.h"
|
||||
|
||||
#include "../../libs/vgeometry/vpointf.h"
|
||||
#include "../../libs/vpatterndb/vcontainer.h"
|
||||
#include "../vgeometry/vpointf.h"
|
||||
#include "../vpatterndb/vcontainer.h"
|
||||
#include "../../visualization/vistoolpointofintersectionarcs.h"
|
||||
#include "../../libs/vwidgets/vmaingraphicsscene.h"
|
||||
#include "../vwidgets/vmaingraphicsscene.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *data, const quint32 &toolId,
|
||||
|
|
|
@ -29,8 +29,8 @@
|
|||
#include "dialogspline.h"
|
||||
#include "ui_dialogspline.h"
|
||||
|
||||
#include "../../libs/vgeometry/vpointf.h"
|
||||
#include "../../libs/vpatterndb/vcontainer.h"
|
||||
#include "../vgeometry/vpointf.h"
|
||||
#include "../vpatterndb/vcontainer.h"
|
||||
#include "../../visualization/vistoolspline.h"
|
||||
#include <QDebug>
|
||||
|
||||
|
|
|
@ -28,8 +28,8 @@
|
|||
|
||||
#include "dialogsplinepath.h"
|
||||
#include "ui_dialogsplinepath.h"
|
||||
#include "../../libs/vgeometry/vsplinepoint.h"
|
||||
#include "../../libs/vpatterndb/vcontainer.h"
|
||||
#include "../vgeometry/vsplinepoint.h"
|
||||
#include "../vpatterndb/vcontainer.h"
|
||||
#include "../../visualization/vistoolsplinepath.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
#define DIALOGSPLINEPATH_H
|
||||
|
||||
#include "dialogtool.h"
|
||||
#include "../../libs/vgeometry/vsplinepath.h"
|
||||
#include "../vgeometry/vsplinepath.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
|
|
@ -28,8 +28,8 @@
|
|||
|
||||
#include "dialoguniondetails.h"
|
||||
#include "ui_dialoguniondetails.h"
|
||||
#include "../../libs/vpatterndb/vdetail.h"
|
||||
#include "../../libs/vpatterndb/vcontainer.h"
|
||||
#include "../vpatterndb/vdetail.h"
|
||||
#include "../vpatterndb/vcontainer.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
*************************************************************************/
|
||||
|
||||
#include "vtoolcut.h"
|
||||
#include "../../libs/vgeometry/vpointf.h"
|
||||
#include "../../libs/vpatterndb/vformula.h"
|
||||
#include "../vgeometry/vpointf.h"
|
||||
#include "../vpatterndb/vformula.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
VToolCut::VToolCut(VAbstractPattern *doc, VContainer *data, const quint32 &id, const QString &formula,
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
*************************************************************************/
|
||||
|
||||
#include "vtoollinepoint.h"
|
||||
#include "../../libs/vgeometry/vpointf.h"
|
||||
#include "../vgeometry/vpointf.h"
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include "vtoolline.h"
|
||||
#include "../../dialogs/tools/dialogline.h"
|
||||
#include <QKeyEvent>
|
||||
#include "../../libs/vgeometry/vpointf.h"
|
||||
#include "../vgeometry/vpointf.h"
|
||||
#include "../../dialogs/tools/dialogline.h"
|
||||
#include "../../visualization/vistoolline.h"
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
*************************************************************************/
|
||||
|
||||
#include "vundocommand.h"
|
||||
#include "../../libs/vmisc/def.h"
|
||||
#include "../vmisc/def.h"
|
||||
|
||||
Q_LOGGING_CATEGORY(vUndo, "v.undo")
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@
|
|||
#include "../vmisc/vabstractapplication.h"
|
||||
#include "../vwidgets/vmaingraphicsscene.h"
|
||||
#include "../vmisc/logging.h"
|
||||
#include "../../libs/vpatterndb/vcontainer.h"
|
||||
#include "../vpatterndb/vcontainer.h"
|
||||
|
||||
Q_DECLARE_LOGGING_CATEGORY(vVis)
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
#include <QCoreApplication>
|
||||
#include <QDebug>
|
||||
#include <QtGlobal>
|
||||
#include "../../libs/qmuparser/qmuparsertest.h"
|
||||
#include "../qmuparser/qmuparsertest.h"
|
||||
|
||||
using namespace qmu;
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
*************************************************************************/
|
||||
|
||||
#include "tst_nameregexp.h"
|
||||
#include "../../libs/qmuparser/qmudef.h"
|
||||
#include "../qmuparser/qmudef.h"
|
||||
|
||||
#include <QtTest>
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
*************************************************************************/
|
||||
|
||||
#include "tst_vabstractdetail.h"
|
||||
#include "../../libs/vlayout/vabstractdetail.h"
|
||||
#include "../vlayout/vabstractdetail.h"
|
||||
|
||||
#include <QPointF>
|
||||
#include <QVector>
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
*************************************************************************/
|
||||
|
||||
#include "tst_varc.h"
|
||||
#include "../../libs/vgeometry/varc.h"
|
||||
#include "../vgeometry/varc.h"
|
||||
|
||||
#include <QtTest>
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
*************************************************************************/
|
||||
|
||||
#include "tst_vlayoutdetail.h"
|
||||
#include "../../libs/vlayout/vlayoutdetail.h"
|
||||
#include "../vlayout/vlayoutdetail.h"
|
||||
|
||||
#include <QtDebug>
|
||||
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
*************************************************************************/
|
||||
|
||||
#include "tst_vposter.h"
|
||||
#include "../../libs/vlayout/vposter.h"
|
||||
#include "../vlayout/vposter.h"
|
||||
|
||||
#include <QImage>
|
||||
#include <QPrinter>
|
||||
|
|
|
@ -27,7 +27,7 @@
|
|||
*************************************************************************/
|
||||
|
||||
#include "tst_vspline.h"
|
||||
#include "../../libs/vgeometry/vspline.h"
|
||||
#include "../vgeometry/vspline.h"
|
||||
|
||||
#include <QtTest>
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user