Build on Mac OS.
--HG-- branch : develop
This commit is contained in:
parent
13dcebb082
commit
018fae459a
|
@ -319,7 +319,7 @@ unix{
|
||||||
# For bundle this names more then enough. We don't need care much about libraries versions.
|
# For bundle this names more then enough. We don't need care much about libraries versions.
|
||||||
libraries.path = $$FRAMEWORKS_DIR
|
libraries.path = $$FRAMEWORKS_DIR
|
||||||
libraries.files += $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib
|
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.
|
# logo on macx.
|
||||||
|
|
|
@ -30,6 +30,8 @@
|
||||||
#include "vsplinepath_p.h"
|
#include "vsplinepath_p.h"
|
||||||
#include "../libs/ifc/exception/vexception.h"
|
#include "../libs/ifc/exception/vexception.h"
|
||||||
|
|
||||||
|
#include <QtMath>
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VSplinePath::VSplinePath(qreal kCurve, quint32 idObject, Draw mode)
|
VSplinePath::VSplinePath(qreal kCurve, quint32 idObject, Draw mode)
|
||||||
: VAbstractCurve(GOType::SplinePath, idObject, mode), d(new VSplinePathData(kCurve))
|
: VAbstractCurve(GOType::SplinePath, idObject, mode), d(new VSplinePathData(kCurve))
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
#include "../../undocommands/movesplinepath.h"
|
#include "../../undocommands/movesplinepath.h"
|
||||||
#include "../../visualization/vistoolsplinepath.h"
|
#include "../../visualization/vistoolsplinepath.h"
|
||||||
|
|
||||||
|
#include <QtMath>
|
||||||
|
|
||||||
const QString VToolSplinePath::ToolType = QStringLiteral("path");
|
const QString VToolSplinePath::ToolType = QStringLiteral("path");
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -31,6 +31,8 @@
|
||||||
|
|
||||||
#include "../vabstracttool.h"
|
#include "../vabstracttool.h"
|
||||||
|
|
||||||
|
#include <QColor>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The VAbstractNode class parent class for all detail node.
|
* @brief The VAbstractNode class parent class for all detail node.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -28,13 +28,15 @@
|
||||||
|
|
||||||
#include "vabstracttool.h"
|
#include "vabstracttool.h"
|
||||||
#include <QGraphicsView>
|
#include <QGraphicsView>
|
||||||
|
#include <QIcon>
|
||||||
#include <QMessageBox>
|
#include <QMessageBox>
|
||||||
|
#include <QtCore/qmath.h>
|
||||||
|
|
||||||
#include "../undocommands/deltool.h"
|
#include "../undocommands/deltool.h"
|
||||||
#include "../core/vapplication.h"
|
#include "../core/vapplication.h"
|
||||||
#include "../geometry/vpointf.h"
|
#include "../geometry/vpointf.h"
|
||||||
#include "../undocommands/savetooloptions.h"
|
#include "../undocommands/savetooloptions.h"
|
||||||
#include "../widgets/vmaingraphicsview.h"
|
#include "../widgets/vmaingraphicsview.h"
|
||||||
#include <QtCore/qmath.h>
|
|
||||||
|
|
||||||
const QString VAbstractTool::AttrType = QStringLiteral("type");
|
const QString VAbstractTool::AttrType = QStringLiteral("type");
|
||||||
const QString VAbstractTool::AttrMx = QStringLiteral("mx");
|
const QString VAbstractTool::AttrMx = QStringLiteral("mx");
|
||||||
|
|
|
@ -25,6 +25,7 @@
|
||||||
|
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
#include <locale>
|
||||||
|
|
||||||
#include "qmuparserfixes.h"
|
#include "qmuparserfixes.h"
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
#include <QPointF>
|
#include <QPointF>
|
||||||
#include <QLineF>
|
#include <QLineF>
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -30,6 +30,7 @@
|
||||||
#define VABSTRACTDETAIL_P_H
|
#define VABSTRACTDETAIL_P_H
|
||||||
|
|
||||||
#include <QSharedData>
|
#include <QSharedData>
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
#ifdef Q_CC_GNU
|
#ifdef Q_CC_GNU
|
||||||
#pragma GCC diagnostic push
|
#pragma GCC diagnostic push
|
||||||
|
|
|
@ -31,10 +31,10 @@
|
||||||
|
|
||||||
#include <QVector>
|
#include <QVector>
|
||||||
#include <QHash>
|
#include <QHash>
|
||||||
|
#include <QRectF>
|
||||||
|
|
||||||
class QPointF;
|
class QPointF;
|
||||||
class VLayoutDetail;
|
class VLayoutDetail;
|
||||||
class QRectF;
|
|
||||||
|
|
||||||
enum class Cases : char { CaseThreeGroup, CaseTwoGroup, CaseDesc};
|
enum class Cases : char { CaseThreeGroup, CaseTwoGroup, CaseDesc};
|
||||||
|
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
|
|
||||||
#include <QPointF>
|
#include <QPointF>
|
||||||
#include <QLineF>
|
#include <QLineF>
|
||||||
|
#include <QtMath>
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VContour::VContour()
|
VContour::VContour()
|
||||||
|
|
|
@ -36,6 +36,8 @@
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
#include <QPainter>
|
#include <QPainter>
|
||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
|
#include <QDir>
|
||||||
|
#include <QtMath>
|
||||||
|
|
||||||
//---------------------------------------------------------------------------------------------------------------------
|
//---------------------------------------------------------------------------------------------------------------------
|
||||||
VPosition::VPosition(const VContour &gContour, int j, const VLayoutDetail &detail, int i, bool *stop, bool rotate,
|
VPosition::VPosition(const VContour &gContour, int j, const VLayoutDetail &detail, int i, bool *stop, bool rotate,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user