From 7676959bdbaed9f42ded6b50eb3fb1a60d403c05 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 8 Oct 2015 20:07:48 +0300 Subject: [PATCH] Fix for build on drone.io. --HG-- branch : develop --- src/app/valentina/dialogs/dialoglayoutsettings.cpp | 2 +- src/libs/vdxf/vdxfengine.cpp | 7 ++++++- src/libs/vgeometry/vsplinepath.cpp | 2 +- src/libs/vlayout/vcontour.cpp | 3 ++- src/libs/vlayout/vlayoutdetail.cpp | 4 +++- src/libs/vlayout/vposition.cpp | 3 ++- src/libs/vlayout/vposter.cpp | 3 ++- src/libs/vmisc/vcommonsettings.cpp | 4 ++-- src/libs/vmisc/vsettings.cpp | 4 ++-- src/libs/vobj/vobjengine.cpp | 1 + src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp | 2 +- .../vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp | 2 +- 12 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.cpp b/src/app/valentina/dialogs/dialoglayoutsettings.cpp index 0d97179ec..dd561e43d 100644 --- a/src/app/valentina/dialogs/dialoglayoutsettings.cpp +++ b/src/app/valentina/dialogs/dialoglayoutsettings.cpp @@ -34,7 +34,7 @@ #include #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../../libs/vmisc/vmath.h" +# include "../vmisc/vmath.h" #else # include #endif diff --git a/src/libs/vdxf/vdxfengine.cpp b/src/libs/vdxf/vdxfengine.cpp index a7de339f0..00a6b10b4 100644 --- a/src/libs/vdxf/vdxfengine.cpp +++ b/src/libs/vdxf/vdxfengine.cpp @@ -29,7 +29,12 @@ #include "vdxfengine.h" #include #include -#include + +#if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) +# include "../vmisc/vmath.h" +#else +# include +#endif //--------------------------------------------------------------------------------------------------------------------- static inline QPaintEngine::PaintEngineFeatures svgEngineFeatures() diff --git a/src/libs/vgeometry/vsplinepath.cpp b/src/libs/vgeometry/vsplinepath.cpp index 437f177af..ab9322c8b 100644 --- a/src/libs/vgeometry/vsplinepath.cpp +++ b/src/libs/vgeometry/vsplinepath.cpp @@ -31,7 +31,7 @@ #include "../ifc/exception/vexception.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../libs/vmisc/vmath.h" +# include "../vmisc/vmath.h" #else # include #endif diff --git a/src/libs/vlayout/vcontour.cpp b/src/libs/vlayout/vcontour.cpp index bf223b767..1a666544c 100644 --- a/src/libs/vlayout/vcontour.cpp +++ b/src/libs/vlayout/vcontour.cpp @@ -32,8 +32,9 @@ #include #include + #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../libs/vmisc/vmath.h" +# include "../vmisc/vmath.h" #else # include #endif diff --git a/src/libs/vlayout/vlayoutdetail.cpp b/src/libs/vlayout/vlayoutdetail.cpp index e6730fb61..12a83846f 100644 --- a/src/libs/vlayout/vlayoutdetail.cpp +++ b/src/libs/vlayout/vlayoutdetail.cpp @@ -31,11 +31,13 @@ #include #include + #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../libs/vmisc/vmath.h" +# include "../vmisc/vmath.h" #else # include #endif + #include //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vlayout/vposition.cpp b/src/libs/vlayout/vposition.cpp index a98ba64ef..3afedeb75 100644 --- a/src/libs/vlayout/vposition.cpp +++ b/src/libs/vlayout/vposition.cpp @@ -39,8 +39,9 @@ #include #include #include + #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../libs/vmisc/vmath.h" +# include "../vmisc/vmath.h" #else # include #endif diff --git a/src/libs/vlayout/vposter.cpp b/src/libs/vlayout/vposter.cpp index f7f1f4b43..e71ce77f1 100644 --- a/src/libs/vlayout/vposter.cpp +++ b/src/libs/vlayout/vposter.cpp @@ -29,8 +29,9 @@ #include "vposter.h" #include #include + #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../libs/vmisc/vmath.h" +# include "../vmisc/vmath.h" #else # include #endif diff --git a/src/libs/vmisc/vcommonsettings.cpp b/src/libs/vmisc/vcommonsettings.cpp index 702ad2249..b2a707511 100644 --- a/src/libs/vmisc/vcommonsettings.cpp +++ b/src/libs/vmisc/vcommonsettings.cpp @@ -33,10 +33,10 @@ #include #include -#include "../../libs/ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../../libs/vmisc/vmath.h" +# include "../vmisc/vmath.h" #else # include #endif diff --git a/src/libs/vmisc/vsettings.cpp b/src/libs/vmisc/vsettings.cpp index 7cca84af8..04c76151f 100644 --- a/src/libs/vmisc/vsettings.cpp +++ b/src/libs/vmisc/vsettings.cpp @@ -33,10 +33,10 @@ #include #include -#include "../../libs/ifc/ifcdef.h" +#include "../ifc/ifcdef.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../../libs/vmisc/vmath.h" +# include "../vmisc/vmath.h" #else # include #endif diff --git a/src/libs/vobj/vobjengine.cpp b/src/libs/vobj/vobjengine.cpp index d07ea882d..66d9c2bbf 100644 --- a/src/libs/vobj/vobjengine.cpp +++ b/src/libs/vobj/vobjengine.cpp @@ -30,6 +30,7 @@ #include #include + #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) # include "../vmisc/vmath.h" #else diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp index b0d355301..330aacc8b 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolspline.cpp @@ -33,7 +33,7 @@ #include "../../../visualization/vistoolspline.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../../libs/vmisc/vmath.h" +# include "../vmisc/vmath.h" #else # include #endif diff --git a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp index c5c47e968..4cc9cc98b 100644 --- a/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp +++ b/src/libs/vtools/tools/drawTools/toolcurve/vtoolsplinepath.cpp @@ -32,7 +32,7 @@ #include "../../../visualization/vistoolsplinepath.h" #if QT_VERSION < QT_VERSION_CHECK(5, 1, 0) -# include "../../libs/vmisc/vmath.h" +# include "../vmisc/vmath.h" #else # include #endif