Merged in ths80/valentina (pull request #74)

fix build on mac os

--HG--
branch : develop
This commit is contained in:
Roman Telezhinskyi 2015-11-11 22:31:16 +02:00
commit 7cb07b6cc9
2 changed files with 2 additions and 1 deletions

View File

@ -273,7 +273,7 @@ unix{
libraries.files += $${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib libraries.files += $${OUT_PWD}/../../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib
tape.path = $$MACOS_DIR tape.path = $$MACOS_DIR
tape.files += $${OUT_PWD}/../tape/$${DESTDIR}/tape tape.files += $${OUT_PWD}/../tape/$${DESTDIR}/tape.app
# Utility pdftops need for saving a layout image to PS and EPS formates. # Utility pdftops need for saving a layout image to PS and EPS formates.
xpdf.path = $$MACOS_DIR xpdf.path = $$MACOS_DIR

View File

@ -32,6 +32,7 @@
#include <csignal> #include <csignal>
#include <QtGlobal> #include <QtGlobal>
#include <QStringList> #include <QStringList>
#include <QSharedPointer>
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <windows.h> #include <windows.h>
#endif /* Q_OS_WIN */ #endif /* Q_OS_WIN */