mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-10-26 06:15:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

make Debian GNU/kFreeBSD compile

Browse source
This commit is contained in:
hefee 2014-04-29 11:02:44 +02:00 committed by Sandro Knauß
parent e62eb62a01
commit 07f57b1982
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mirall/application.cpp
View file

@ -64,14 +64,12 @@ static const char optionsC[] =
QString applicationTrPath() QString applicationTrPath()
{ {
#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) #if defined(Q_OS_WIN)
return QString::fromLatin1(DATADIR"/"APPLICATION_EXECUTABLE"/i18n/");
#endif
#ifdef Q_OS_MAC
return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
#endif
#ifdef Q_OS_WIN
return QApplication::applicationDirPath(); return QApplication::applicationDirPath();
#elif defined(Q_OS_MAC)
return QApplication::applicationDirPath()+QLatin1String("/../Resources/Translations"); // path defaults to app dir.
#elif defined(Q_OS_UNIX)
return QString::fromLatin1(DATADIR"/"APPLICATION_EXECUTABLE"/i18n/");
#endif #endif
} }
} }

2
src/mirall/folderwatcher.cpp
View file

@ -29,7 +29,7 @@
#include "mirall/folderwatcher_win.h" #include "mirall/folderwatcher_win.h"
#elif defined(Q_OS_MAC) #elif defined(Q_OS_MAC)
#include "mirall/folderwatcher_mac.h" #include "mirall/folderwatcher_mac.h"
#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) #elif defined(Q_OS_UNIX)
#include "mirall/folderwatcher_linux.h" #include "mirall/folderwatcher_linux.h"
#endif #endif

4
src/mirall/utility.cpp
View file

@ -143,7 +143,7 @@ QString Utility::platform()
return QLatin1String("Linux"); return QLatin1String("Linux");
#elif defined(__DragonFly__) // Q_OS_FREEBSD also defined #elif defined(__DragonFly__) // Q_OS_FREEBSD also defined
return QLatin1String("DragonFlyBSD"); return QLatin1String("DragonFlyBSD");
#elif defined(Q_OS_FREEBSD) #elif defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL)
return QLatin1String("FreeBSD"); return QLatin1String("FreeBSD");
#elif defined(Q_OS_NETBSD) #elif defined(Q_OS_NETBSD)
return QLatin1String("NetBSD"); return QLatin1String("NetBSD");
@ -199,7 +199,7 @@ void Utility::setLaunchOnStartup(const QString &appName, const QString& guiName,
qint64 Utility::freeDiskSpace(const QString &path, bool *ok) qint64 Utility::freeDiskSpace(const QString &path, bool *ok)
{ {
#if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) #if defined(Q_OS_MAC) || defined(Q_OS_FREEBSD) || defined(Q_OS_FREEBSD_KERNEL)
struct statvfs stat; struct statvfs stat;
statvfs(path.toUtf8().data(), &stat); statvfs(path.toUtf8().data(), &stat);
return (qint64) stat.f_bavail * stat.f_frsize; return (qint64) stat.f_bavail * stat.f_frsize;