diff options
author | Lars Knoll <lars.knoll@qt.io> | 2020-09-04 09:45:26 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2020-09-12 23:35:56 +0200 |
commit | 557623cc4f22295e5e89462dfdff20d78b3b9cdc (patch) | |
tree | a10e2bf2b43ddae1cf90cf8005eb0e2957f716f7 /src/corelib/io/qsettings.cpp | |
parent | d24174918f1f224cd32f41b1a640a9db27965e64 (diff) |
Rename QLibraryInfo::location() to path()
As per ### Qt6 comment. Also rename the LibraryLocation enum
to LibraryPath.
Change-Id: I556025a19c5bcdf2ff52598eaba32269522d4128
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/io/qsettings.cpp')
-rw-r--r-- | src/corelib/io/qsettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index 0a62ffb2be..42a0f38be3 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -992,11 +992,11 @@ static std::unique_lock<QBasicMutex> initDefaultPaths(std::unique_lock<QBasicMut locker.unlock(); /* - QLibraryInfo::location() uses QSettings, so in order to + QLibraryInfo::path() uses QSettings, so in order to avoid a dead-lock, we can't hold the global mutex while calling it. */ - QString systemPath = QLibraryInfo::location(QLibraryInfo::SettingsPath) + QLatin1Char('/'); + QString systemPath = QLibraryInfo::path(QLibraryInfo::SettingsPath) + QLatin1Char('/'); locker.lock(); if (pathHash->isEmpty()) { |