From b9f886d28df60e0ca03554c51c373ac39f09d92b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 1 Apr 2017 19:53:28 +0300 Subject: [PATCH] Fix building on Mac. --HG-- branch : develop --- src/app/valentina/mainwindow.cpp | 2 ++ src/libs/vlayout/vlayoutgenerator.h | 2 -- src/libs/vmisc/vabstractapplication.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index b83dbf5c6..d5202f5d9 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -4261,6 +4261,7 @@ void MainWindow::Preferences() } //--------------------------------------------------------------------------------------------------------------------- +#if defined(Q_OS_MAC) void MainWindow::CreateMeasurements() { const QString tape = qApp->TapeFilePath(); @@ -4274,6 +4275,7 @@ void MainWindow::CreateMeasurements() QProcess::startDetached(tape, arguments, workingDirectory); } +#endif //--------------------------------------------------------------------------------------------------------------------- void MainWindow::ExportLayoutAs() diff --git a/src/libs/vlayout/vlayoutgenerator.h b/src/libs/vlayout/vlayoutgenerator.h index a953daf48..f8fa58d42 100644 --- a/src/libs/vlayout/vlayoutgenerator.h +++ b/src/libs/vlayout/vlayoutgenerator.h @@ -145,6 +145,4 @@ private: QList MoveDetails(qreal length, const QVector &details); }; -typedef std::shared_ptr VLayoutGeneratorPtr; - #endif // VLAYOUTGENERATOR_H diff --git a/src/libs/vmisc/vabstractapplication.h b/src/libs/vmisc/vabstractapplication.h index 25ad17552..75701e48e 100644 --- a/src/libs/vmisc/vabstractapplication.h +++ b/src/libs/vmisc/vabstractapplication.h @@ -49,6 +49,7 @@ class QUndoStack; class VAbstractApplication;// use in define +class VAbstractPattern; class VMainGraphicsView; #if defined(qApp)