diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:16 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 17:46:34 +0200 |
| commit | 440286655e0ca271506cf7cc02ad0dbf4baef9ca (patch) | |
| tree | 896fa81adb8b14a69355a3a6cf64d06ec8173c9a /src/corelib/io/qstandardpaths_unix.cpp | |
| parent | 1e27ad1697187549151657ba187928e439300db7 (diff) | |
| parent | e164d61ca8263fc4b46fdd916e1ea77c7dd2b735 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: I4a78428a8ea273b6960792e3b8043f816fa37fcf
Diffstat (limited to 'src/corelib/io/qstandardpaths_unix.cpp')
| -rw-r--r-- | src/corelib/io/qstandardpaths_unix.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/io/qstandardpaths_unix.cpp b/src/corelib/io/qstandardpaths_unix.cpp index 6425890e3f..c35d7adc9f 100644 --- a/src/corelib/io/qstandardpaths_unix.cpp +++ b/src/corelib/io/qstandardpaths_unix.cpp @@ -339,6 +339,9 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) break; case FontsLocation: dirs += QDir::homePath() + QLatin1String("/.fonts"); + dirs += xdgDataDirs(); + for (int i = 1; i < dirs.count(); ++i) + dirs[i].append(QLatin1String("/fonts")); break; default: break; |