1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QStandardPaths: on Windows, add APPDIR and APPDIR/data for GenericDataLocation

Browse Source 
This allows multiple applications installed into the same directory,
to share data files without polluting a more global directory
like C:/ProgramData.

Change-Id: Id5f4f9bc9d2ccb7ec677babcc08c1c5a641178f6
Reviewed-by: Samuel Gaist <samuel.gaist@edeltech.ch>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
David Faure 2015-08-12 11:10:27 +02:00
parent efa379b9d5
commit 6c09b9e553
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qstandardpaths.cpp
View File

@ -182,7 +182,7 @@ QT_BEGIN_NAMESPACE
\li "C:/Users/<USER>/AppData/Local/<APPNAME>/cache" \li "C:/Users/<USER>/AppData/Local/<APPNAME>/cache"
\row \li GenericDataLocation \row \li GenericDataLocation
\li "~/Library/Application Support", "/Library/Application Support" \li "~/Library/Application Support", "/Library/Application Support"
\li "C:/Users/<USER>/AppData/Local", "C:/ProgramData" \li "C:/Users/<USER>/AppData/Local", "C:/ProgramData", "<APPDIR>", "<APPDIR>/data"
\row \li RuntimeLocation \row \li RuntimeLocation
\li "~/Library/Application Support" \li "~/Library/Application Support"
\li "C:/Users/<USER>" \li "C:/Users/<USER>"

6
src/corelib/io/qstandardpaths_win.cpp
View File

@ -212,10 +212,8 @@ QStringList QStandardPaths::standardLocations(StandardLocation type)
} }
dirs.append(result); dirs.append(result);
#ifndef QT_BOOTSTRAPPED #ifndef QT_BOOTSTRAPPED
if (type != GenericDataLocation) { dirs.append(QCoreApplication::applicationDirPath());
dirs.append(QCoreApplication::applicationDirPath()); dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/data"));
dirs.append(QCoreApplication::applicationDirPath() + QLatin1String("/data"));
}
#endif #endif
} }
break; break;