From 13f347dc1abd5351f757b7fe8782a50a90dd36dc Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 22 Aug 2017 09:23:26 +0300 Subject: [PATCH] Fix build on Mac OS X. --HG-- branch : develop --- src/app/valentina/dialogs/dialogpatternproperties.h | 2 -- src/app/valentina/mainwindow.cpp | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/app/valentina/dialogs/dialogpatternproperties.h b/src/app/valentina/dialogs/dialogpatternproperties.h index 86df10310..ac826ff26 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.h +++ b/src/app/valentina/dialogs/dialogpatternproperties.h @@ -33,8 +33,6 @@ #include "../options.h" #include -#include "../vformat/vlabeltemplate.h" - class VPattern; class VContainer; class QCheckBox; diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index af4077ad2..e271f55b8 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -1744,8 +1744,8 @@ void MainWindow::SyncMeasurements() #if defined(Q_OS_MAC) void MainWindow::OpenAt(QAction *where) { - const QString path = curFile.left(curFile.indexOf(where->text())) + where->text(); - if (path == curFile) + const QString path = qApp->GetPPath().left(qApp->GetPPath().indexOf(where->text())) + where->text(); + if (path == qApp->GetPPath()) { return; } @@ -5061,7 +5061,7 @@ void MainWindow::UpdateWindowTitle() static QIcon fileIcon = QIcon(QCoreApplication::applicationDirPath() + QLatin1String("/../Resources/Valentina.icns")); QIcon icon; - if (not curFile.isEmpty()) + if (not qApp->GetPPath().isEmpty()) { if (not isWindowModified()) {