Fix for build on drone.io.

--HG-- branch : develop
2015-10-08 21:11:50 +03:00 · 2015-10-08 21:11:50 +03:00 · 026804bc37
commit 026804bc37
parent 64e07c405a
41 changed files with 75 additions and 75 deletions
--- a/src/app/tape/mapplication.cpp
+++ b/src/app/tape/mapplication.cpp
@ -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
--- a/src/app/tape/version.h
+++ b/src/app/tape/version.h
@ -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"
--- a/src/app/valentina/core/vcmdexport.h
+++ b/src/app/valentina/core/vcmdexport.h
@ -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
--- a/src/app/valentina/core/vformulaproperty.cpp
+++ b/src/app/valentina/core/vformulaproperty.cpp
@ -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};

--- a/src/app/valentina/core/vformulaproperty.h
+++ b/src/app/valentina/core/vformulaproperty.h
@ -29,7 +29,7 @@
 #ifndef VFORMULAPROPERTY_H
 #define VFORMULAPROPERTY_H

-#include "../../libs/vpropertyexplorer/vproperty.h"
+#include "../vpropertyexplorer/vproperty.h"

 class VFormula;

--- a/src/app/valentina/core/vformulapropertyeditor.cpp
+++ b/src/app/valentina/core/vformulapropertyeditor.cpp
@ -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;

--- a/src/app/valentina/core/vformulapropertyeditor.h
+++ b/src/app/valentina/core/vformulapropertyeditor.h
@ -35,7 +35,7 @@
 #include <QLabel>
 #include <QSpacerItem>

-#include "../../libs/vpatterndb/vformula.h"
+#include "../vpatterndb/vformula.h"

 class VFormulaPropertyEditor : public QWidget
 {
--- a/src/app/valentina/core/vtooloptionspropertybrowser.cpp
+++ b/src/app/valentina/core/vtooloptionspropertybrowser.cpp
@ -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>
--- a/src/app/valentina/core/vtooloptionspropertybrowser.h
+++ b/src/app/valentina/core/vtooloptionspropertybrowser.h
@ -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;
--- a/src/app/valentina/dialogs/dialoghistory.cpp
+++ b/src/app/valentina/dialogs/dialoghistory.cpp
@ -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"

 //---------------------------------------------------------------------------------------------------------------------
--- a/src/app/valentina/dialogs/dialoghistory.h
+++ b/src/app/valentina/dialogs/dialoghistory.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>

--- a/src/app/valentina/dialogs/dialoglayoutprogress.h
+++ b/src/app/valentina/dialogs/dialoglayoutprogress.h
@ -31,7 +31,7 @@

 #include <QDialog>

-#include "../../libs/vlayout/vlayoutdef.h"
+#include "../vlayout/vlayoutdef.h"

 namespace Ui
 {
--- a/src/app/valentina/dialogs/dialoglayoutsettings.cpp
+++ b/src/app/valentina/dialogs/dialoglayoutsettings.cpp
@ -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)
--- a/src/app/valentina/dialogs/dialoglayoutsettings.h
+++ b/src/app/valentina/dialogs/dialoglayoutsettings.h
@ -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
 {
--- a/src/app/valentina/dialogs/dialognewpattern.cpp
+++ b/src/app/valentina/dialogs/dialognewpattern.cpp
@ -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>
--- a/src/app/valentina/dialogs/dialogsavelayout.cpp
+++ b/src/app/valentina/dialogs/dialogsavelayout.cpp
@ -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>
--- a/src/app/valentina/mainwindowsnogui.h
+++ b/src/app/valentina/mainwindowsnogui.h
@ -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;
--- a/src/app/valentina/version.h
+++ b/src/app/valentina/version.h
@ -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"
--- a/src/libs/vmisc/vcommonsettings.h
+++ b/src/libs/vmisc/vcommonsettings.h
@ -30,7 +30,7 @@
 #define VCOMMONSETTINGS_H

 #include <QSettings>
-#include "../../libs/vlayout/vbank.h"
+#include "../vlayout/vbank.h"

 class VCommonSettings : public QSettings
 {
--- a/src/libs/vmisc/vsettings.h
+++ b/src/libs/vmisc/vsettings.h
@ -30,7 +30,7 @@
 #define VSETTINGS_H

 #include "vcommonsettings.h"
-#include "../../libs/vlayout/vbank.h"
+#include "../vlayout/vbank.h"

 class VSettings : public VCommonSettings
 {
--- a/src/libs/vtools/dialogs/tools/dialogdetail.h
+++ b/src/libs/vtools/dialogs/tools/dialogdetail.h
@ -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.
--- a/src/libs/vtools/dialogs/tools/dialogheight.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp
@ -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"

 //---------------------------------------------------------------------------------------------------------------------
 /**
--- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp
+++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp
@ -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"

 //---------------------------------------------------------------------------------------------------------------------
 /**
--- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
@ -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,
--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
@ -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,
--- a/src/libs/vtools/dialogs/tools/dialogspline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp
@ -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>

--- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
@ -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"

 //---------------------------------------------------------------------------------------------------------------------
--- a/src/libs/vtools/dialogs/tools/dialogsplinepath.h
+++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.h
@ -30,7 +30,7 @@
 #define DIALOGSPLINEPATH_H

 #include "dialogtool.h"
-#include "../../libs/vgeometry/vsplinepath.h"
+#include "../vgeometry/vsplinepath.h"

 namespace Ui
 {
--- a/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp
+++ b/src/libs/vtools/dialogs/tools/dialoguniondetails.cpp
@ -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"

 //---------------------------------------------------------------------------------------------------------------------
 /**
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toolcut/vtoolcut.cpp
@ -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,
--- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp
+++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoollinepoint.cpp
@ -27,7 +27,7 @@
 *************************************************************************/

 #include "vtoollinepoint.h"
-#include "../../libs/vgeometry/vpointf.h"
+#include "../vgeometry/vpointf.h"

 //---------------------------------------------------------------------------------------------------------------------
 /**
--- a/src/libs/vtools/tools/drawTools/vtoolline.cpp
+++ b/src/libs/vtools/tools/drawTools/vtoolline.cpp
@ -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"

--- a/src/libs/vtools/undocommands/vundocommand.cpp
+++ b/src/libs/vtools/undocommands/vundocommand.cpp
@ -27,7 +27,7 @@
 *************************************************************************/

 #include "vundocommand.h"
-#include "../../libs/vmisc/def.h"
+#include "../vmisc/def.h"

 Q_LOGGING_CATEGORY(vUndo, "v.undo")

--- a/src/libs/vtools/visualization/visualization.h
+++ b/src/libs/vtools/visualization/visualization.h
@ -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)

--- a/src/test/ParserTest/main.cpp
+++ b/src/test/ParserTest/main.cpp
@ -29,7 +29,7 @@
 #include <QCoreApplication>
 #include <QDebug>
 #include <QtGlobal>
-#include "../../libs/qmuparser/qmuparsertest.h"
+#include "../qmuparser/qmuparsertest.h"

 using namespace qmu;

--- a/src/test/ValentinaTest/tst_nameregexp.cpp
+++ b/src/test/ValentinaTest/tst_nameregexp.cpp
@ -27,7 +27,7 @@
 *************************************************************************/

 #include "tst_nameregexp.h"
-#include "../../libs/qmuparser/qmudef.h"
+#include "../qmuparser/qmudef.h"

 #include <QtTest>

--- a/src/test/ValentinaTest/tst_vabstractdetail.cpp
+++ b/src/test/ValentinaTest/tst_vabstractdetail.cpp
@ -27,7 +27,7 @@
 *************************************************************************/

 #include "tst_vabstractdetail.h"
-#include "../../libs/vlayout/vabstractdetail.h"
+#include "../vlayout/vabstractdetail.h"

 #include <QPointF>
 #include <QVector>
--- a/src/test/ValentinaTest/tst_varc.cpp
+++ b/src/test/ValentinaTest/tst_varc.cpp
@ -27,7 +27,7 @@
 *************************************************************************/

 #include "tst_varc.h"
-#include "../../libs/vgeometry/varc.h"
+#include "../vgeometry/varc.h"

 #include <QtTest>

--- a/src/test/ValentinaTest/tst_vlayoutdetail.cpp
+++ b/src/test/ValentinaTest/tst_vlayoutdetail.cpp
@ -27,7 +27,7 @@
 *************************************************************************/

 #include "tst_vlayoutdetail.h"
-#include "../../libs/vlayout/vlayoutdetail.h"
+#include "../vlayout/vlayoutdetail.h"

 #include <QtDebug>

--- a/src/test/ValentinaTest/tst_vposter.cpp
+++ b/src/test/ValentinaTest/tst_vposter.cpp
@ -27,7 +27,7 @@
 *************************************************************************/

 #include "tst_vposter.h"
-#include "../../libs/vlayout/vposter.h"
+#include "../vlayout/vposter.h"

 #include <QImage>
 #include <QPrinter>
--- a/src/test/ValentinaTest/tst_vspline.cpp
+++ b/src/test/ValentinaTest/tst_vspline.cpp
@ -27,7 +27,7 @@
 *************************************************************************/

 #include "tst_vspline.h"
-#include "../../libs/vgeometry/vspline.h"
+#include "../vgeometry/vspline.h"

 #include <QtTest>