resolve merge conflict

--HG--
branch : develop

src/app/app.pro

@@ -319,7 +319,7 @@ unix{
     # For bundle this names more then enough. We don't need care much about libraries versions.
     libraries.path = $$FRAMEWORKS_DIR
     libraries.files += $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib
-    libraries.files = $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib
+    libraries.files += $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib
 
 
     # logo on macx.

src/app/geometry/vsplinepath.cpp

@@ -30,6 +30,8 @@
 #include "vsplinepath_p.h"
 #include "../libs/ifc/exception/vexception.h"
 
+#include <QtMath>
+
 //---------------------------------------------------------------------------------------------------------------------
 VSplinePath::VSplinePath(qreal kCurve, quint32 idObject, Draw mode)
     : VAbstractCurve(GOType::SplinePath, idObject, mode), d(new VSplinePathData(kCurve))

src/app/tools/drawTools/vtoolsplinepath.cpp

@@ -31,6 +31,8 @@
 #include "../../undocommands/movesplinepath.h"
 #include "../../visualization/vistoolsplinepath.h"
 
+#include <QtMath>
+
 const QString VToolSplinePath::ToolType = QStringLiteral("path");
 
 //---------------------------------------------------------------------------------------------------------------------

src/app/tools/nodeDetails/vabstractnode.h

@@ -31,6 +31,8 @@
 
 #include "../vabstracttool.h"
 
+#include <QColor>
+
 /**
  * @brief The VAbstractNode class parent class for all detail node.
  */

src/app/tools/vabstracttool.cpp

@@ -28,7 +28,8 @@
 
 #include "vabstracttool.h"
 #include <QGraphicsView>
-#include <QStyle>
+#include <QIcon>
+#include <QMessageBox>
 #include <QtCore/qmath.h>
 #include "../../libs/vpropertyexplorer/checkablemessagebox.h"
 #include "../undocommands/deltool.h"

src/libs/qmuparser/qmuparserdef.h

@@ -25,6 +25,7 @@
 
 #include <QMap>
 #include <QString>
+#include <locale>
 
 #include "qmuparserfixes.h"
 

src/libs/vlayout/vabstractdetail.cpp

@@ -32,6 +32,7 @@
 #include <QVector>
 #include <QPointF>
 #include <QLineF>
+#include <QDebug>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**

src/libs/vlayout/vabstractdetail_p.h

@@ -30,6 +30,7 @@
 #define VABSTRACTDETAIL_P_H
 
 #include <QSharedData>
+#include <QString>
 
 #ifdef Q_CC_GNU
     #pragma GCC diagnostic push

src/libs/vlayout/vbank.h

@@ -31,10 +31,10 @@
 
 #include <QVector>
 #include <QHash>
+#include <QRectF>
 
 class QPointF;
 class VLayoutDetail;
-class QRectF;
 
 enum class Cases : char { CaseThreeGroup, CaseTwoGroup, CaseDesc};
 

src/libs/vlayout/vcontour.cpp

@@ -32,6 +32,7 @@
 
 #include <QPointF>
 #include <QLineF>
+#include <QtMath>
 
 //---------------------------------------------------------------------------------------------------------------------
 VContour::VContour()

src/libs/vlayout/vposition.cpp

@@ -36,6 +36,8 @@
 #include <QImage>
 #include <QPainter>
 #include <QCoreApplication>
+#include <QDir>
+#include <QtMath>
 
 //---------------------------------------------------------------------------------------------------------------------
 VPosition::VPosition(const VContour &gContour, int j, const VLayoutDetail &detail, int i, bool *stop, bool rotate,