mirror of
https://github.com/nextcloud/desktop.git
synced 2024-10-24 13:25:52 +03:00
fix Qt 5 build on Mac/Win
This commit is contained in:
parent
76deabe4df
commit
171a9e1575
1 changed files with 3 additions and 2 deletions
|
@ -24,6 +24,7 @@
|
||||||
#include "creds/credentialsfactory.h"
|
#include "creds/credentialsfactory.h"
|
||||||
|
|
||||||
#include <QWidget>
|
#include <QWidget>
|
||||||
|
#include <QCoreApplication>
|
||||||
|
|
||||||
#define DEFAULT_REMOTE_POLL_INTERVAL 30000 // default remote poll time in milliseconds
|
#define DEFAULT_REMOTE_POLL_INTERVAL 30000 // default remote poll time in milliseconds
|
||||||
#define DEFAULT_MAX_LOG_LINES 20000
|
#define DEFAULT_MAX_LOG_LINES 20000
|
||||||
|
@ -192,14 +193,14 @@ QString MirallConfigFile::excludeFile(Scope scope) const
|
||||||
// Check alternative places...
|
// Check alternative places...
|
||||||
if( ! fi.isReadable() ) {
|
if( ! fi.isReadable() ) {
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
fi.setFile( QApplication::applicationDirPath(), exclFile );
|
fi.setFile( QCoreApplication::applicationDirPath(), exclFile );
|
||||||
#endif
|
#endif
|
||||||
#ifdef Q_OS_UNIX
|
#ifdef Q_OS_UNIX
|
||||||
fi.setFile( QString( SYSCONFDIR "/%1").arg(Theme::instance()->appName()), exclFile );
|
fi.setFile( QString( SYSCONFDIR "/%1").arg(Theme::instance()->appName()), exclFile );
|
||||||
#endif
|
#endif
|
||||||
#ifdef Q_OS_MAC
|
#ifdef Q_OS_MAC
|
||||||
// exec path is inside the bundle
|
// exec path is inside the bundle
|
||||||
fi.setFile( QApplication::applicationDirPath(),
|
fi.setFile( QCoreApplication::applicationDirPath(),
|
||||||
QLatin1String("../Resources/") + exclFile );
|
QLatin1String("../Resources/") + exclFile );
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue