Fix build on Mac OS X.
--HG-- branch : develop
This commit is contained in:
parent
d7cd89a2f6
commit
13f347dc1a
|
@ -33,8 +33,6 @@
|
||||||
#include "../options.h"
|
#include "../options.h"
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
|
|
||||||
#include "../vformat/vlabeltemplate.h"
|
|
||||||
|
|
||||||
class VPattern;
|
class VPattern;
|
||||||
class VContainer;
|
class VContainer;
|
||||||
class QCheckBox;
|
class QCheckBox;
|
||||||
|
|
|
@ -1744,8 +1744,8 @@ void MainWindow::SyncMeasurements()
|
||||||
#if defined(Q_OS_MAC)
|
#if defined(Q_OS_MAC)
|
||||||
void MainWindow::OpenAt(QAction *where)
|
void MainWindow::OpenAt(QAction *where)
|
||||||
{
|
{
|
||||||
const QString path = curFile.left(curFile.indexOf(where->text())) + where->text();
|
const QString path = qApp->GetPPath().left(qApp->GetPPath().indexOf(where->text())) + where->text();
|
||||||
if (path == curFile)
|
if (path == qApp->GetPPath())
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -5061,7 +5061,7 @@ void MainWindow::UpdateWindowTitle()
|
||||||
static QIcon fileIcon = QIcon(QCoreApplication::applicationDirPath() +
|
static QIcon fileIcon = QIcon(QCoreApplication::applicationDirPath() +
|
||||||
QLatin1String("/../Resources/Valentina.icns"));
|
QLatin1String("/../Resources/Valentina.icns"));
|
||||||
QIcon icon;
|
QIcon icon;
|
||||||
if (not curFile.isEmpty())
|
if (not qApp->GetPPath().isEmpty())
|
||||||
{
|
{
|
||||||
if (not isWindowModified())
|
if (not isWindowModified())
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user