From 018fae459a98a3e2aa53d455b2fb42871b00f232 Mon Sep 17 00:00:00 2001
From: Roman Telezhynskyi <kroluku@gmail.com>
Date: Thu, 26 Feb 2015 22:18:52 +0200
Subject: [PATCH] Build on Mac OS.

--HG--
branch : develop
---
 src/app/app.pro                             | 2 +-
 src/app/geometry/vsplinepath.cpp            | 2 ++
 src/app/tools/drawTools/vtoolsplinepath.cpp | 2 ++
 src/app/tools/nodeDetails/vabstractnode.h   | 2 ++
 src/app/tools/vabstracttool.cpp             | 4 +++-
 src/libs/qmuparser/qmuparserdef.h           | 1 +
 src/libs/vlayout/vabstractdetail.cpp        | 1 +
 src/libs/vlayout/vabstractdetail_p.h        | 1 +
 src/libs/vlayout/vbank.h                    | 2 +-
 src/libs/vlayout/vcontour.cpp               | 1 +
 src/libs/vlayout/vposition.cpp              | 2 ++
 11 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/app/app.pro b/src/app/app.pro
index d60c7f765..0d23a1ae2 100644
--- a/src/app/app.pro
+++ b/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.
diff --git a/src/app/geometry/vsplinepath.cpp b/src/app/geometry/vsplinepath.cpp
index 635653333..2170ffbf0 100644
--- a/src/app/geometry/vsplinepath.cpp
+++ b/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))
diff --git a/src/app/tools/drawTools/vtoolsplinepath.cpp b/src/app/tools/drawTools/vtoolsplinepath.cpp
index 3d1c18e5a..612cd6e38 100644
--- a/src/app/tools/drawTools/vtoolsplinepath.cpp
+++ b/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");
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/tools/nodeDetails/vabstractnode.h b/src/app/tools/nodeDetails/vabstractnode.h
index 95a668378..e8d41eaa4 100644
--- a/src/app/tools/nodeDetails/vabstractnode.h
+++ b/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.
  */
diff --git a/src/app/tools/vabstracttool.cpp b/src/app/tools/vabstracttool.cpp
index 2a7a738c5..27861636d 100644
--- a/src/app/tools/vabstracttool.cpp
+++ b/src/app/tools/vabstracttool.cpp
@@ -28,13 +28,15 @@
 
 #include "vabstracttool.h"
 #include <QGraphicsView>
+#include <QIcon>
 #include <QMessageBox>
+#include <QtCore/qmath.h>
+
 #include "../undocommands/deltool.h"
 #include "../core/vapplication.h"
 #include "../geometry/vpointf.h"
 #include "../undocommands/savetooloptions.h"
 #include "../widgets/vmaingraphicsview.h"
-#include <QtCore/qmath.h>
 
 const QString VAbstractTool::AttrType        = QStringLiteral("type");
 const QString VAbstractTool::AttrMx          = QStringLiteral("mx");
diff --git a/src/libs/qmuparser/qmuparserdef.h b/src/libs/qmuparser/qmuparserdef.h
index a74d29d00..f52723335 100644
--- a/src/libs/qmuparser/qmuparserdef.h
+++ b/src/libs/qmuparser/qmuparserdef.h
@@ -25,6 +25,7 @@
 
 #include <QMap>
 #include <QString>
+#include <locale>
 
 #include "qmuparserfixes.h"
 
diff --git a/src/libs/vlayout/vabstractdetail.cpp b/src/libs/vlayout/vabstractdetail.cpp
index 89bdddc8b..9adbd8126 100644
--- a/src/libs/vlayout/vabstractdetail.cpp
+++ b/src/libs/vlayout/vabstractdetail.cpp
@@ -32,6 +32,7 @@
 #include <QVector>
 #include <QPointF>
 #include <QLineF>
+#include <QDebug>
 
 //---------------------------------------------------------------------------------------------------------------------
 /**
diff --git a/src/libs/vlayout/vabstractdetail_p.h b/src/libs/vlayout/vabstractdetail_p.h
index 17826ed76..15bf4a31b 100644
--- a/src/libs/vlayout/vabstractdetail_p.h
+++ b/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
diff --git a/src/libs/vlayout/vbank.h b/src/libs/vlayout/vbank.h
index fd55dadcd..2222fe323 100644
--- a/src/libs/vlayout/vbank.h
+++ b/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};
 
diff --git a/src/libs/vlayout/vcontour.cpp b/src/libs/vlayout/vcontour.cpp
index f28d9a9e8..0358347e7 100644
--- a/src/libs/vlayout/vcontour.cpp
+++ b/src/libs/vlayout/vcontour.cpp
@@ -32,6 +32,7 @@
 
 #include <QPointF>
 #include <QLineF>
+#include <QtMath>
 
 //---------------------------------------------------------------------------------------------------------------------
 VContour::VContour()
diff --git a/src/libs/vlayout/vposition.cpp b/src/libs/vlayout/vposition.cpp
index 23c977cf3..8a5ab17db 100644
--- a/src/libs/vlayout/vposition.cpp
+++ b/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,