Commit 8b2ef0db authored by Dennis Nienhüser's avatar Dennis Nienhüser
Browse files

Do not require cwd to be app dir on Windows

Fixes plugin and data loading on Windows when starting marble-qt.exe
from some other path than its basedir.

(cherry picked from commit 63672d0e)
parent a215d229
......@@ -122,6 +122,10 @@ QString MarbleDirs::systemPath()
{
QString systempath;
#ifdef Q_OS_WIN
return QCoreApplication::applicationDirPath() + QDir::separator() + "data";
#endif
#ifdef Q_OS_MACX
//
// On OSX lets try to find any file first in the bundle
......@@ -203,6 +207,10 @@ QString MarbleDirs::pluginSystemPath()
if ( !runTimeMarblePluginPath.isEmpty() )
return runTimeMarblePluginPath;
#ifdef Q_OS_WIN
return QCoreApplication::applicationDirPath() + QDir::separator() + "plugins";
#endif
#ifdef Q_OS_ANDROID
return "assets:/plugins";
#endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment