From 171a9e1575f82d80c2da2ceaaacbdc5450e654ca Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Thu, 5 Sep 2013 19:53:29 +0200 Subject: [PATCH] fix Qt 5 build on Mac/Win --- src/mirall/mirallconfigfile.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mirall/mirallconfigfile.cpp b/src/mirall/mirallconfigfile.cpp index b5a7e3be5..6b18fcb0a 100644 --- a/src/mirall/mirallconfigfile.cpp +++ b/src/mirall/mirallconfigfile.cpp @@ -24,6 +24,7 @@ #include "creds/credentialsfactory.h" #include +#include #define DEFAULT_REMOTE_POLL_INTERVAL 30000 // default remote poll time in milliseconds #define DEFAULT_MAX_LOG_LINES 20000 @@ -192,14 +193,14 @@ QString MirallConfigFile::excludeFile(Scope scope) const // Check alternative places... if( ! fi.isReadable() ) { #ifdef Q_OS_WIN - fi.setFile( QApplication::applicationDirPath(), exclFile ); + fi.setFile( QCoreApplication::applicationDirPath(), exclFile ); #endif #ifdef Q_OS_UNIX fi.setFile( QString( SYSCONFDIR "/%1").arg(Theme::instance()->appName()), exclFile ); #endif #ifdef Q_OS_MAC // exec path is inside the bundle - fi.setFile( QApplication::applicationDirPath(), + fi.setFile( QCoreApplication::applicationDirPath(), QLatin1String("../Resources/") + exclFile ); #endif }