diff options
Diffstat (limited to 'src/corelib/io')
| -rw-r--r-- | src/corelib/io/qloggingregistry.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/io/qsettings.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp index 91d3e5a73c..e1e35a07ed 100644 --- a/src/corelib/io/qloggingregistry.cpp +++ b/src/corelib/io/qloggingregistry.cpp @@ -324,7 +324,7 @@ void QLoggingRegistry::initializeRules() #if !defined(QT_BOOTSTRAPPED) // get rules from Qt data configuration path const QString qtConfigPath - = QDir(QLibraryInfo::location(QLibraryInfo::DataPath)).absoluteFilePath(configFileName); + = QDir(QLibraryInfo::path(QLibraryInfo::DataPath)).absoluteFilePath(configFileName); qr = loadRulesFromFile(qtConfigPath); #endif 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()) { |