comparison base/ResourceFinder.cpp @ 982:f161ca450050

Use QStandardPaths::writableLocation(DataLocation) instead of synthesising path ourselves (hopefully fixing encoding difficulties on Windows)

 #include <QFileInfo>
 #include <QStringList>
 #include <QProcess>
 #include <QCoreApplication>
 
+#if QT_VERSION >= 0x050000
+#include <QStandardPaths>
+#endif
+
 #include <cstdlib>
 #include <iostream>
 
 /**
    Resource files may be found in three places:

 }
 
 QString
 ResourceFinder::getUserResourcePrefix()
 {
+#if QT_VERSION >= 0x050000
+    QString loc = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+    return loc;
+#else
 #ifdef Q_OS_WIN32
+    // This does not work correctly for non-ASCII home directory names
     char *homedrive = getenv("HOMEDRIVE");
     char *homepath = getenv("HOMEPATH");
     QString home;
     if (homedrive && homepath) {
         home = QString("%1%2").arg(homedrive).arg(homepath);

 #else
     return QString("%1/.local/share/%2")
         .arg(home)
         .arg(qApp->applicationName());
 #endif
-#endif    
+#endif
+#endif
 }
 
 QStringList
 ResourceFinder::getResourcePrefixList()
 {